Merge branch 'release/7.0.1xx' into release/7.0.2xx

Jason Zhai · Jason Zhai · commit fe9bea7ae6fd · 2022-10-07T23:26:35.000-07:00
diff --git a/src/Assets/TestProjects/SampleManifest/MockListSampleUpdated.json b/src/Assets/TestProjects/SampleManifest/MockListSampleUpdated.json
@@ -5,7 +5,7 @@
             "description": "mock-workload-1",
             "kind": "dev",
             "packs": [
-                "Test.Pack.A",
+                "Test.Pack.A.Renamed",
                 "Test.Pack.B",
                 "Test.Pack.C"
             ]
@@ -20,17 +20,17 @@
         "mock-workload-3": {
             "description": "mock-workload-3",
             "packs": [
-                "Test.Pack.A"
+                "Test.Pack.A.Renamed"
             ]
         }
     },
     "packs": {
-        "Test.Pack.A": {
+        "Test.Pack.A.Renamed": {
             "version": "2.0.0",
             "kind": "sdk"
         },
         "Test.Pack.B": {
-            "version": "2.0.0",
+            "version": "3.0.0",
             "kind": "framework"
         },
         "Test.Pack.C": {
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
@@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Cli.Utils
     internal class MSBuildForwardingAppWithoutLogging
     {
         private static readonly bool AlwaysExecuteMSBuildOutOfProc = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_RUN_MSBUILD_OUTOFPROC");
-        private static readonly bool UseMSBuildServer = !Env.GetEnvironmentVariableAsBool("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER");
+        private static readonly bool UseMSBuildServer = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_USE_MSBUILD_SERVER", false);
 
         private const string MSBuildExeName = "MSBuild.dll";
 
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs
@@ -563,8 +563,9 @@ public IEnumerable<WorkloadId> GetUpdatedWorkloads(WorkloadResolver advertisingM
 
                 var existingWorkload = _workloads[workloadId];
                 var existingPacks = GetPacksInWorkload(existingWorkload.workload, existingWorkload.manifest).Select(p => p.packId).ToHashSet();
-                var updatedWorkload = advertisingManifestResolver._workloads[workloadId].workload;
-                var updatedPacks = advertisingManifestResolver.GetPacksInWorkload(existingWorkload.workload, existingWorkload.manifest).Select(p => p.packId);
+
+                var updatedWorkload = advertisingManifestResolver._workloads[workloadId];
+                var updatedPacks = advertisingManifestResolver.GetPacksInWorkload(updatedWorkload.workload, updatedWorkload.manifest).Select(p => p.packId);
 
                 if (!existingPacks.SetEquals(updatedPacks) || existingPacks.Any(p => PackHasChanged(_packs[p].pack, advertisingManifestResolver._packs[p].pack)))
                 {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Cli.Utils`
`16`	`16`	`internal class MSBuildForwardingAppWithoutLogging`
`17`	`17`	`{`
`18`	`18`	`private static readonly bool AlwaysExecuteMSBuildOutOfProc = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_RUN_MSBUILD_OUTOFPROC");`
`19`		`- private static readonly bool UseMSBuildServer = !Env.GetEnvironmentVariableAsBool("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER");`
	`19`	`+ private static readonly bool UseMSBuildServer = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_USE_MSBUILD_SERVER", false);`
`20`	`20`
`21`	`21`	`private const string MSBuildExeName = "MSBuild.dll";`
`22`	`22`