Merged PR 556497: Remove msbuild specific dependencies

This PR removes `ForMSBuild` packages because all the pieces are using the same version.
And it also fixes the test discovery issue that is happening in Test Explorer when trying to run the cache tests.

Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc

@@ -18,8 +18,8 @@ export const msbuildReferences: Managed.ManagedNugetPackage[] = [
 @@public
 export const msbuildRuntimeContent = [
     importFrom("Microsoft.Build.Runtime").pkg,
-    importFrom("SystemMemoryForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-    importFrom("SystemNumericsVectorsForMSBuild").pkg,
+    importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+    importFrom("System.Numerics.Vectors").withQualifier({targetFramework: "netstandard2.0"}).pkg,
     importFrom("SystemRuntimeCompilerServicesUnsafeForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
     importFrom("System.Threading.Tasks.Dataflow").pkg,
     

Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc

@@ -16,16 +16,10 @@ namespace DistributedTest {
             },
         skipTestRun: BuildXLSdk.restrictTestRunToSomeQualifiers,
         assemblyBindingRedirects: [
-            {
-                // Currently System.IO.Pipeline package references are inconsistent
-                // and this causes issues running tests from the IDE.
-                // Please, change or remove this once System.IO.Pipeline package version is changed.
-                name: "System.IO.Pipelines",
-                publicKeyToken: "cc7b13ffcd2ddd51",
-                culture: "neutral",
-                oldVersion: "0.0.0.0-4.0.0.1",
-                newVersion: "4.0.0.1",
-            },
+            // System.Memory 4.5.4 is a bit weird, because net461 version references System.Buffer.dll v.4.0.3.0
+            // but System.Memory.dll from netstandard2.0 references Ssstem.Buffer.dll v.4.0.2.0!
+            // And the rest of the world references System.Buffer.dll v.4.0.3.0
+            // So we need to have a redirect to solve this problem.
             {
                 name: "System.Buffers",
                 publicKeyToken: "cc7b13ffcd2ddd51",
@@ -33,6 +27,14 @@ namespace DistributedTest {
                 oldVersion: "0.0.0.0-5.0.0.0",
                 newVersion: "4.0.3.0",
             },
+            // Different packages reference different version of this assembly.
+            {
+                name: "System.Runtime.CompilerServices.Unsafe",
+                publicKeyToken: "b03f5f7f11d50a3a",
+                culture: "neutral",
+                oldVersion: "0.0.0.0-5.0.0.0",
+                newVersion: "4.0.6.0",
+            },
         ],
         appConfig: f`App.config`,
         references: [

Public/Src/Cache/ContentStore/VfsTest/BuildXL.Cache.ContentStore.Vfs.Test.dsc

@@ -16,22 +16,24 @@ namespace VfsTest {
             },
         skipTestRun: !BuildXLSdk.isHostOsWin || BuildXLSdk.restrictTestRunToSomeQualifiers,
         assemblyBindingRedirects: [
-            {
-                // Currently System.IO.Pipeline package references are inconsistent
-                // and this causes issues running tests from the IDE.
-                // Please, change or remove this once System.IO.Pipeline package version is changed.
-                name: "System.IO.Pipelines",
-                publicKeyToken: "cc7b13ffcd2ddd51",
-                culture: "neutral",
-                oldVersion: "0.0.0.0-4.0.0.1",
-                newVersion: "4.0.0.1",
-            },
+            // System.Memory 4.5.4 is a bit weird, because net461 version references System.Buffer.dll v.4.0.3.0
+            // but System.Memory.dll from netstandard2.0 references Ssstem.Buffer.dll v.4.0.2.0!
+            // And the rest of the world references System.Buffer.dll v.4.0.3.0
+            // So we need to have a redirect to solve this problem.
             {
                 name: "System.Buffers",
                 publicKeyToken: "cc7b13ffcd2ddd51",
                 culture: "neutral",
                 oldVersion: "0.0.0.0-5.0.0.0",
-                newVersion: "4.0.1.0",
+                newVersion: "4.0.3.0",
+            },
+            // Different packages reference different version of this assembly.
+            {
+                name: "System.Runtime.CompilerServices.Unsafe",
+                publicKeyToken: "b03f5f7f11d50a3a",
+                culture: "neutral",
+                oldVersion: "0.0.0.0-5.0.0.0",
+                newVersion: "4.0.6.0",
             },
         ],
         appConfig: f`App.config`,
@@ -43,7 +45,9 @@ namespace VfsTest {
                 NetFx.System.IO.dll,
                 NetFx.System.Net.Primitives.dll,
                 NetFx.System.Xml.dll,
-                NetFx.System.Xml.Linq.dll
+                NetFx.System.Xml.Linq.dll,
+                NetFx.System.dll,
+                NetFx.System.Data.dll
             ),
             UtilitiesCore.dll,
             Hashing.dll,

Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc

@@ -26,9 +26,9 @@ namespace VBCSCompilerLogger {
         ],
         runtimeContent:[
             importFrom("System.Reflection.Metadata").pkg,
-            importFrom("SystemMemoryForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
             importFrom("SystemRuntimeCompilerServicesUnsafeForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("SystemNumericsVectorsForMSBuild").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Numerics.Vectors").withQualifier({targetFramework: "netstandard2.0"}).pkg,
         ]
     });
 

cg/nuget/cgmanifest.json

@@ -3340,15 +3340,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Memory",
-          "Version": "4.5.3"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3466,15 +3457,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Numerics.Vectors",
-          "Version": "4.5.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",

config.dsc

@@ -281,9 +281,10 @@ config({
 
                 // Buffers and Memory
                 { id: "System.Buffers", version: "4.5.1" }, // A different version, because StackExchange.Redis uses it.
-                { id: "System.Memory", version: "4.5.3", dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors"]},
+                { id: "System.Memory", version: "4.5.4", dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors"] },
                 { id: "System.Runtime.CompilerServices.Unsafe", version: "4.7.0" },
                 { id: "System.IO.Pipelines", version: "4.7.0", dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
+                { id: "System.Numerics.Vectors", version: "4.4.0" },
 
                 // Extra dependencies to make MSBuild work
                 { id: "Microsoft.VisualStudio.Setup.Configuration.Interop", version: "1.16.30"},
@@ -291,9 +292,6 @@ config({
                 { id: "System.Text.Encoding.CodePages", version: "4.5.1",
                     dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe"]},
                 { id: "System.Runtime.CompilerServices.Unsafe", version: "4.5.3", alias: "SystemRuntimeCompilerServicesUnsafeForMSBuild", dependentPackageIdsToSkip: ["*"]},
-                { id: "System.Memory", version: "4.5.4", alias: "SystemMemoryForMSBuild", dependentPackageIdsToSkip: ["*"]},
-                { id: "System.Numerics.Vectors", version: "4.4.0", alias: "SystemNumericsVectorsForMSBuild"},
-
                 // Used for MSBuild input/output prediction
                 { id: "Microsoft.Build.Prediction", version: "0.3.0" },
 

config.nuget.dotnetcore.dsc

@@ -129,7 +129,6 @@ export const pkgs = [
     { id: "System.Net.WebHeaderCollection", version: pkgVersion },
     { id: "System.Net.WebSockets", version: pkgVersion },
     { id: "System.Net.WebSockets.Client", version: "4.3.1" },
-    { id: "System.Numerics.Vectors", version: "4.5.0" },
     { id: "System.ObjectModel", version: pkgVersion },
     { id: "System.Private.DataContractSerialization", version: pkgVersion },
     { id: "System.Reflection", version: pkgVersion },