From 3788d3c64d3df4e22a6effd49aa1b961ee4b49b5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 15:42:44 -0700 Subject: [PATCH 1/5] Update to the shipping version of MSBuild --- eng/Versions.props | 4 ++++ src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dd5670c9b..9477bfda1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,6 +129,10 @@ 6.8.1-rc.2 + + + 17.8.5 + 2.0.0-preview.1.23463.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 938dba427..5e27dde4e 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -10,12 +10,12 @@ - - + + - + From dd308194a14944dadb831bc3a1e3553e818af1d5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 1 Apr 2024 16:42:03 -0700 Subject: [PATCH 2/5] Fix source build --- eng/Version.Details.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2225244..273229c37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -158,6 +158,7 @@ https://github.com/dotnet/msbuild b5265ef370a651f8c3458110b804e5cbf869eeb5 + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted From 8edfe5367b15c6d5c5698c6f759fce220e90fb0b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 3 Apr 2024 13:41:57 -0700 Subject: [PATCH 3/5] match the version of SRM msbuild depends on --- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5e27dde4e..13f485425 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -15,7 +15,7 @@ - + From ef4b3ceba22eb341fa93b9413361aa6bbbd6edd1 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 5 Apr 2024 13:34:37 -0500 Subject: [PATCH 4/5] Update Version.Details.xml --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 273229c37..308fa334b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -158,6 +158,10 @@ https://github.com/dotnet/msbuild b5265ef370a651f8c3458110b804e5cbf869eeb5 + + + https://github.com/dotnet/msbuild + b5265ef370a651f8c3458110b804e5cbf869eeb5 From 45fab0c0f1309c007fc70e9507f53578cdc2b58b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 7 May 2024 16:10:42 -0700 Subject: [PATCH 5/5] Update to the source build reference package with 17.8.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 308fa334b..860b71773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -244,9 +244,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 95f83e27806330fec09edd96e06bba3acabe3f35 + 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb