From 976a11f45f62525609982f071ae8e49273ee4d52 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 4 Oct 2022 14:27:00 -0400 Subject: [PATCH 1/9] Fix checking for updated workload packs in advertising manifests --- .../SampleManifest/MockListSampleUpdated.json | 8 ++++---- .../WorkloadResolver.cs | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Assets/TestProjects/SampleManifest/MockListSampleUpdated.json b/src/Assets/TestProjects/SampleManifest/MockListSampleUpdated.json index 466e2389968e..4f4ea1c3e682 100644 --- 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/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs index dc6acbc0e058..d13eb54c6e51 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs @@ -563,8 +563,9 @@ public IEnumerable 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))) { From 7b25ad2aa983e1636544b3673b6ca2315b1144e1 Mon Sep 17 00:00:00 2001 From: AR-May <67507805+AR-May@users.noreply.github.com> Date: Thu, 6 Oct 2022 17:37:18 +0200 Subject: [PATCH 2/9] Change default for msbuild server. --- .../MSBuildForwardingAppWithoutLogging.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs index e6cb9dec582c..07177eb7d3fb 100644 --- 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"; From 6b0b732be4e8efc4f87c225913bee3c04f9ec8ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 14:24:25 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/fsharp build 20221007.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.0-beta.22506.5 -> To Version 7.0.0-beta.22507.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2c70983d09..1567c112a647 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 04fa10a77431d9235c8a92ef2ae63ca6fd958a20 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 04fa10a77431d9235c8a92ef2ae63ca6fd958a20 diff --git a/eng/Versions.props b/eng/Versions.props index cacd5ecde528..2c0ac48ee0c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,7 +137,7 @@ - 12.0.5-beta.22506.5 + 12.0.5-beta.22507.2 From c6d7913681bf174c94978b15510486b493d183de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 15:35:17 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/msbuild build 20221007.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22506-03 -> To Version 17.5.0-preview-22507-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2c70983d09..fdf1fc706f03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + 0228ca023326b59650d1d81d03d8c2711f88fa82 - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + 0228ca023326b59650d1d81d03d8c2711f88fa82 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index cacd5ecde528..b639465c35a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.5.0-preview-22506-03 + 17.5.0-preview-22507-01 $(MicrosoftBuildPackageVersion) - 17.5.0-preview-22507-01 + 17.5.0-preview-22507-02 $(MicrosoftBuildPackageVersion) - 7.0.100-rtm.22507.5 + 7.0.100-rtm.22507.11 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.100-rtm.22507.5 + 7.0.100-rtm.22507.11 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 97c186b6f500e9b65852edc28b3de302ffe3bf52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 16:56:57 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/msbuild build 20221007.3 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22507-02 -> To Version 17.5.0-preview-22507-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36407d861b1e..5a3c03d92106 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/msbuild - 06db703089b68dca8186b9bf62fd1da41f75b5cd + 9785b178cd5d2fa6e20ba3290191be7a46f2991d - + https://github.com/dotnet/msbuild - 06db703089b68dca8186b9bf62fd1da41f75b5cd + 9785b178cd5d2fa6e20ba3290191be7a46f2991d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 221dcf7a7aa1..8b1ccdc13883 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.5.0-preview-22507-02 + 17.5.0-preview-22507-03 $(MicrosoftBuildPackageVersion) - 17.5.0-preview-22507-03 + 17.5.0-preview-22507-04 $(MicrosoftBuildPackageVersion) - 12.0.5-beta.22507.2 + 12.0.5-beta.22507.6