diff --git a/eng/Versions.props b/eng/Versions.props index 0407b6042..3701162d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ 8.0.1 20230414.1 2.14.1 - 1.8.1 + 1.10.2 1.0.52 diff --git a/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch b/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch deleted file mode 100644 index a8feaadf9..000000000 --- a/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 762b92d0d2cf90fe7990a0f5b9c2629bc402176f Mon Sep 17 00:00:00 2001 -From: Tanner Gooding -Date: Mon, 11 Aug 2025 17:24:17 +0000 -Subject: [PATCH] Move to net8 - ---- - src/MSBuildLocator/Microsoft.Build.Locator.csproj | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj -index 2df3750..c5b8125 100644 ---- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj -+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj -@@ -2,7 +2,7 @@ - - - Library -- net46;net6.0 -+ net7;net8 - full - - false -@@ -24,6 +24,10 @@ - $(DefineConstants);FEATURE_VISUALSTUDIOSETUP - - -+ -+ -+ -+ - - - --- -2.43.0 - diff --git a/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch b/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch new file mode 100644 index 000000000..2ca86ba63 --- /dev/null +++ b/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch @@ -0,0 +1,25 @@ +From d3449618da87b81090aa1bcf5d16a378e05f9784 Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Mon, 6 Oct 2025 15:34:23 +0200 +Subject: [PATCH 1/1] Update target framework. + +--- + src/MSBuildLocator/Microsoft.Build.Locator.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj +index 7308e50..5ade71c 100644 +--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj ++++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj +@@ -1,7 +1,7 @@ + + + Library +- net46;net8.0 ++ net10.0 + full + false + Microsoft.Build.Locator +-- +2.51.0 + diff --git a/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch b/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch index b67673210..7814939bd 100644 --- a/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch +++ b/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch @@ -1,21 +1,21 @@ -From 172ddcea384b69303bbfb9a0a3df39741f84adba Mon Sep 17 00:00:00 2001 -From: Ella Hathaway -Date: Thu, 14 Aug 2025 23:16:58 +0000 -Subject: [PATCH] Remove MicroBuild signing +From 75791e299a84b72a68150cd3a6e5435c47886cbc Mon Sep 17 00:00:00 2001 +From: Tom Deseyn +Date: Mon, 6 Oct 2025 17:36:58 +0200 +Subject: [PATCH 1/1] Remove MicroBuild signing Backport: https://github.com/dotnet/arcade/issues/16057 --- - .../Microsoft.Build.Locator.csproj | 18 ------------------ - 1 file changed, 18 deletions(-) + .../Microsoft.Build.Locator.csproj | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj -index 2df3750..3990321 100644 +index 5ade71c..07c935d 100644 --- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj +++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj -@@ -29,22 +29,4 @@ +@@ -23,20 +23,4 @@ + - - - - @@ -27,14 +27,11 @@ index 2df3750..3990321 100644 - build\ - - -- - - - Microsoft400 - - -- -- -2.43.0 - +2.51.0 diff --git a/src/externalPackages/src/MSBuildLocator b/src/externalPackages/src/MSBuildLocator index 6235ee448..694ff392b 160000 --- a/src/externalPackages/src/MSBuildLocator +++ b/src/externalPackages/src/MSBuildLocator @@ -1 +1 @@ -Subproject commit 6235ee4484ceb8f9db32826ae252b0a2aad0955e +Subproject commit 694ff392b2dcf6ac58fe865afd1c982eb9449014