Skip to content

Update MSBuildLocator to include Pre Release #7508

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
jonpryor merged 5 commits into from
Nov 8, 2022
Merged

Update MSBuildLocator to include Pre Release #7508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2adb0b3
Update MSBuildLocator to include Pre Release
dellis1972 Oct 31, 2022
af1a51e
Change to use an Environment Variable
dellis1972 Nov 1, 2022
9abcd76
Always try prerelease
dellis1972 Nov 2, 2022
9d49541
ff
dellis1972 Nov 2, 2022
837480c
update vswhere.cmd to also include prerelease
dellis1972 Nov 4, 2022
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
7 changes: 6 additions & 1 deletion build-tools/scripts/vswhere.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
@echo off
CALL "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
SET result = ""
FOR /F "tokens=1 delims=" %%F IN ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath') DO SET result=%%F
if "%result%" == "" (
FOR /F "tokens=1 delims=" %%F IN ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -prerelease -latest -property installationPath') DO SET result=%%F
)
echo %result%
4 changes: 4 additions & 0 deletions tools/vswhere/MSBuildLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public static VisualStudioInstance QueryLatest ()
if (!File.Exists (vswhere))
throw new FileNotFoundException ("Cannot find vswhere.exe!", vswhere);
instance.VisualStudioRootPath = Exec (vswhere, "-latest -products * -requires Microsoft.Component.MSBuild -property installationPath");
if (!Directory.Exists (instance.VisualStudioRootPath)) {
// try -prerelease
instance.VisualStudioRootPath = Exec (vswhere, "-prerelease -latest -products * -requires Microsoft.Component.MSBuild -property installationPath");
}
if (!Directory.Exists (instance.VisualStudioRootPath)) {
throw new DirectoryNotFoundException ($"vswhere.exe result returned a directory that did not exist: {instance.VisualStudioRootPath}");
}
Expand Down