Skip to content

Update MSBuildLocator to v1.8.1 #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 11, 2025
Merged

Update MSBuildLocator to v1.8.1 #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0d3a0f
Update MSBuildLocator to v1.8.1
tannergooding Aug 11, 2025
5ed4bd3
Update patches and versions.props
tannergooding Aug 11, 2025
eee1a81
Minify the patch for MSBuildLocator/0002-Move-to-net8
tannergooding Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions src/externalPackages/patches/MSBuildLocator/0001-Eliminate-prebuilts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

25 changes: 14 additions & 11 deletions src/externalPackages/patches/MSBuildLocator/0002-Move-to-net8.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 11 Sep 2023 16:23:30 -0500
Subject: [PATCH] Update TFMs
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 056f7ca..67f18e4 100644
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.0;net8.0</TargetFrameworks>
+ <TargetFrameworks>net7;net8</TargetFrameworks>
<DebugType>full</DebugType>

<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -20,6 +20,10 @@
@@ -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.43.0

2 changes: 1 addition & 1 deletion src/externalPackages/src/MSBuildLocator
Open in desktop
Submodule MSBuildLocator updated 11 files
+11 −0 .config/tsaoptions.json
+6 −5 .github/workflows/pull-request.yml
+2 −2 Directory.Build.props
+99 −80 azure-pipelines.yml
+ − branding/MSBuild-NuGet-Icon.png
+4 −4 src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
+90 −80 src/MSBuildLocator/DotNetSdkLocationHelper.cs
+47 −15 src/MSBuildLocator/MSBuildLocator.cs
+3 −2 src/MSBuildLocator/Microsoft.Build.Locator.csproj
+18 −0 src/MSBuildLocator/VisualStudioInstanceQueryOptions.cs
+1 −1 version.json