From 52d4b5f1237c0568cea24860300face48df06030 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 6 Oct 2025 14:08:49 +0200
Subject: [PATCH 1/4] Update MSBuildLocator submodule to v1.10.2.

This version provides a fix for crashing on Mono (https://github.com/dotnet/msbuild/issues/12570).
---
 eng/Versions.props                            |  2 +-
 .../MSBuildLocator/0002-Move-to-net8.patch    | 36 -------------------
 .../MSBuildLocator/0002-Update-tfm.patch      | 25 +++++++++++++
 src/externalPackages/src/MSBuildLocator       |  2 +-
 4 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
 create mode 100644 src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch

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 @@
     <AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>8.0.1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
     <CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
     <HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
-    <MSBuildLocatorReleaseVersion>1.8.1</MSBuildLocatorReleaseVersion>
+    <MSBuildLocatorReleaseVersion>1.10.2</MSBuildLocatorReleaseVersion>
     <SolutionPersistenceVersion>1.0.52</SolutionPersistenceVersion>
   </PropertyGroup>
   <PropertyGroup>
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 <tagoo@outlook.com>
-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 @@
-
-   <PropertyGroup>
-     <OutputType>Library</OutputType>
--    <TargetFrameworks>net46;net6.0</TargetFrameworks>
-+    <TargetFrameworks>net7;net8</TargetFrameworks>
-     <DebugType>full</DebugType>
-
-     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-@@ -24,6 +24,10 @@
-     <DefineConstants>$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
-   </PropertyGroup>
-
-+  <ItemGroup>
-+    <FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="7.0.0" />
-+  </ItemGroup>
-+
-   <ItemGroup Condition="'$(TargetFramework)'=='net46'">
-     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" PrivateAssets="all" />
-     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
---
-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..f36edaceb
--- /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 <tom.deseyn@gmail.com>
+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 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFrameworks>net46;net8.0</TargetFrameworks>
++    <TargetFrameworks>net8.0</TargetFrameworks>
+     <DebugType>full</DebugType>
+     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+     <AssemblyName>Microsoft.Build.Locator</AssemblyName>
+-- 
+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

From 550aba4009543852b81ea34578d89bbb14821e76 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 6 Oct 2025 17:38:10 +0200
Subject: [PATCH 2/4] Update patch.

---
 .../0003-Remove-MicroBuild-signing.patch      | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch b/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
index b67673210..6fb575c74 100644
--- a/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
+++ b/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
@@ -1,21 +1,20 @@
-From 172ddcea384b69303bbfb9a0a3df39741f84adba Mon Sep 17 00:00:00 2001
-From: Ella Hathaway <ellahathaway@microsoft.com>
-Date: Thu, 14 Aug 2025 23:16:58 +0000
-Subject: [PATCH] Remove MicroBuild signing
-Backport: https://github.com/dotnet/arcade/issues/16057
+From 75791e299a84b72a68150cd3a6e5435c47886cbc Mon Sep 17 00:00:00 2001
+From: Tom Deseyn <tom.deseyn@gmail.com>
+Date: Mon, 6 Oct 2025 17:36:58 +0200
+Subject: [PATCH 1/1] Remove MicroBuild signing
 
 ---
- .../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 @@
+     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" PrivateAssets="all" />
      <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
    </ItemGroup>
- 
 -  <ItemGroup>
 -    <PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
 -    <Content Include="build\Microsoft.Build.Locator.props">
@@ -27,14 +26,11 @@ index 2df3750..3990321 100644
 -      <PackagePath>build\</PackagePath>
 -    </Content>
 -  </ItemGroup>
--
 -  <ItemGroup>
 -    <FilesToSign Include="$(OutDir)\Microsoft.Build.Locator.dll">
 -      <Authenticode>Microsoft400</Authenticode>
 -    </FilesToSign>
 -  </ItemGroup>
--
  </Project>
 -- 
-2.43.0
-
+2.51.0

From 6e45bfd4de6b55b947c137daf279ca28da47653e Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 6 Oct 2025 17:41:20 +0200
Subject: [PATCH 3/4] Include Backport url in patch.

---
 .../patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch b/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
index 6fb575c74..7814939bd 100644
--- a/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
+++ b/src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
@@ -2,6 +2,7 @@ From 75791e299a84b72a68150cd3a6e5435c47886cbc Mon Sep 17 00:00:00 2001
 From: Tom Deseyn <tom.deseyn@gmail.com>
 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               | 16 ----------------

From f597ba3afefff1f102fe2d299e1f930e2dea8b0b Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 6 Oct 2025 17:59:06 +0200
Subject: [PATCH 4/4] Try patching to net10.0.

---
 .../patches/MSBuildLocator/0002-Update-tfm.patch                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch b/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch
index f36edaceb..2ca86ba63 100644
--- a/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch
+++ b/src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch
@@ -16,7 +16,7 @@ index 7308e50..5ade71c 100644
    <PropertyGroup>
      <OutputType>Library</OutputType>
 -    <TargetFrameworks>net46;net8.0</TargetFrameworks>
-+    <TargetFrameworks>net8.0</TargetFrameworks>
++    <TargetFrameworks>net10.0</TargetFrameworks>
      <DebugType>full</DebugType>
      <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
      <AssemblyName>Microsoft.Build.Locator</AssemblyName>