Skip to content

Commit

Permalink
win,build,tools: support VS prerelease
Browse files Browse the repository at this point in the history
PR-URL: #36033
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
baruchiro authored and BethGriggs committed Dec 15, 2020
1 parent 713d1eb commit c4c8541
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/msvs/vswhere_usability_wrapper.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@if not defined DEBUG_HELPER @ECHO OFF
setlocal
if "%~1"=="prerelease" set VSWHERE_WITH_PRERELEASE=1
if "%~2"=="prerelease" set VSWHERE_WITH_PRERELEASE=1
set "InstallerPath=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
if not exist "%InstallerPath%" set "InstallerPath=%ProgramFiles%\Microsoft Visual Studio\Installer"
if not exist "%InstallerPath%" goto :no-vswhere
Expand Down
2 changes: 1 addition & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ echo Looking for Visual Studio 2019
@rem cleared first as vswhere_usability_wrapper.cmd doesn't when it fails to
@rem detect the version searched for
if not defined target_env set "VCINSTALLDIR="
call tools\msvs\vswhere_usability_wrapper.cmd "[16.0,17.0)"
call tools\msvs\vswhere_usability_wrapper.cmd "[16.0,17.0)" "prerelease"
if "_%VCINSTALLDIR%_" == "__" goto vs-set-2017
set "WIXSDKDIR=%WIX%\SDK\VS2017"
if defined msi (
Expand Down

0 comments on commit c4c8541

Please sign in to comment.