From a0d3a0f0d76e6b884b51207b998657f1416116f7 Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Mon, 11 Aug 2025 09:29:23 -0700
Subject: [PATCH 1/3] Update MSBuildLocator to v1.8.1

---
 src/externalPackages/src/MSBuildLocator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/externalPackages/src/MSBuildLocator b/src/externalPackages/src/MSBuildLocator
index e0281df33..6235ee448 160000
--- a/src/externalPackages/src/MSBuildLocator
+++ b/src/externalPackages/src/MSBuildLocator
@@ -1 +1 @@
-Subproject commit e0281df33274ac3c3e22acc9b07dcb4b31d57dc0
+Subproject commit 6235ee4484ceb8f9db32826ae252b0a2aad0955e

From 5ed4bd31900568eba7725083d21e77ccf485728c Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Mon, 11 Aug 2025 10:16:31 -0700
Subject: [PATCH 2/3] Update patches and versions.props

---
 eng/Versions.props                            |  2 +-
 .../0001-Eliminate-prebuilts.patch            | 20 +++++------
 .../MSBuildLocator/0002-Move-to-net8.patch    | 34 +++++++++++++------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index ec1414794..0407b6042 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.6.10</MSBuildLocatorReleaseVersion>
+    <MSBuildLocatorReleaseVersion>1.8.1</MSBuildLocatorReleaseVersion>
     <SolutionPersistenceVersion>1.0.52</SolutionPersistenceVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/externalPackages/patches/MSBuildLocator/0001-Eliminate-prebuilts.patch b/src/externalPackages/patches/MSBuildLocator/0001-Eliminate-prebuilts.patch
index 0ae2a1be3..7c562af49 100644
--- a/src/externalPackages/patches/MSBuildLocator/0001-Eliminate-prebuilts.patch
+++ b/src/externalPackages/patches/MSBuildLocator/0001-Eliminate-prebuilts.patch
@@ -1,28 +1,28 @@
-From c74b360ba5a3290cdd99e7dac203a6a2de750a3c Mon Sep 17 00:00:00 2001
-From: Rainer Sigwald <raines@microsoft.com>
-Date: Fri, 8 Sep 2023 19:41:06 +0000
-Subject: [PATCH 1/2] Eliminate prebuilts
+From d001cf459e85799dc324c99670974ff4f747dcfc Mon Sep 17 00:00:00 2001
+From: Tanner Gooding <tagoo@outlook.com>
+Date: Mon, 11 Aug 2025 10:11:29 -0700
+Subject: [PATCH] Eliminate prebuilts
 
 ---
  Directory.Build.props | 5 -----
  1 file changed, 5 deletions(-)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index b7aa431..f075a6a 100644
+index a58f4b5..f075a6a 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -27,11 +27,6 @@
      <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
    </PropertyGroup>
- 
+
 -  <ItemGroup>
--    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
--    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
+-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="all" />
 -  </ItemGroup>
 -
    <ItemGroup>
      <None Include="$(MSBuildThisFileDirectory)\branding\MSBuild-NuGet-Icon.png"
            Pack="true"
--- 
-2.42.0
+--
+2.50.1.windows.1
 
diff --git a/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch b/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
index ab894a1ce..51debc1b2 100644
--- a/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
+++ b/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
@@ -1,33 +1,45 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Matt Thalman <mthalman@microsoft.com>
-Date: Mon, 11 Sep 2023 16:23:30 -0500
+From 3caa46657682be1fa6557c517f63977ade63920c Mon Sep 17 00:00:00 2001
+From: Tanner Gooding <tagoo@outlook.com>
+Date: Mon, 11 Aug 2025 10:12:24 -0700
 Subject: [PATCH] Update TFMs
 
 ---
- src/MSBuildLocator/Microsoft.Build.Locator.csproj | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ src/MSBuildLocator/Microsoft.Build.Locator.csproj | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
-index 056f7ca..67f18e4 100644
+index 2df3750..54a13ac 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.0;net8.0</TargetFrameworks>
      <DebugType>full</DebugType>
- 
+
      <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-@@ -20,6 +20,10 @@
+@@ -15,7 +15,7 @@
+     <Title>MSBuild Locator</Title>
+     <Description>Package that assists in locating and using a copy of MSBuild installed as part of Visual Studio 2017 or higher or .NET Core SDK 2.1 or higher.</Description>
+ 	<PackageTags>msbuildlocator;locator;buildlocator</PackageTags>
+-
++
+     <EnablePackageValidation>true</EnablePackageValidation>
+     <PackageValidationBaselineVersion>1.6.1</PackageValidationBaselineVersion>
+   </PropertyGroup>
+@@ -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.7.2175" PrivateAssets="all" />
+     <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.50.1.windows.1
+

From eee1a8188c9a84630805f1d83593411615fefcdd Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@outlook.com>
Date: Mon, 11 Aug 2025 10:30:31 -0700
Subject: [PATCH 3/3] Minify the patch for MSBuildLocator/0002-Move-to-net8

---
 .../MSBuildLocator/0002-Move-to-net8.patch    | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch b/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
index 51debc1b2..a8feaadf9 100644
--- a/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
+++ b/src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
@@ -1,14 +1,14 @@
-From 3caa46657682be1fa6557c517f63977ade63920c Mon Sep 17 00:00:00 2001
+From 762b92d0d2cf90fe7990a0f5b9c2629bc402176f Mon Sep 17 00:00:00 2001
 From: Tanner Gooding <tagoo@outlook.com>
-Date: Mon, 11 Aug 2025 10:12:24 -0700
-Subject: [PATCH] Update TFMs
+Date: Mon, 11 Aug 2025 17:24:17 +0000
+Subject: [PATCH] Move to net8
 
 ---
- src/MSBuildLocator/Microsoft.Build.Locator.csproj | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ 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..54a13ac 100644
+index 2df3750..c5b8125 100644
 --- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
 +++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
 @@ -2,7 +2,7 @@
@@ -16,19 +16,10 @@ index 2df3750..54a13ac 100644
    <PropertyGroup>
      <OutputType>Library</OutputType>
 -    <TargetFrameworks>net46;net6.0</TargetFrameworks>
-+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
++    <TargetFrameworks>net7;net8</TargetFrameworks>
      <DebugType>full</DebugType>
 
      <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-@@ -15,7 +15,7 @@
-     <Title>MSBuild Locator</Title>
-     <Description>Package that assists in locating and using a copy of MSBuild installed as part of Visual Studio 2017 or higher or .NET Core SDK 2.1 or higher.</Description>
- 	<PackageTags>msbuildlocator;locator;buildlocator</PackageTags>
--
-+
-     <EnablePackageValidation>true</EnablePackageValidation>
-     <PackageValidationBaselineVersion>1.6.1</PackageValidationBaselineVersion>
-   </PropertyGroup>
 @@ -24,6 +24,10 @@
      <DefineConstants>$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
    </PropertyGroup>
@@ -41,5 +32,5 @@ index 2df3750..54a13ac 100644
      <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.50.1.windows.1
+2.43.0