From 4e3883ec2de29aa780cb310a364847812a5afdd5 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Sun, 8 Nov 2020 13:23:04 +0200 Subject: [PATCH] win,build,tools: support VS prerelease PR-URL: https://github.com/nodejs/node/pull/36033 Reviewed-By: Bartosz Sosnowski Reviewed-By: Rich Trott Reviewed-By: James M Snell --- tools/msvs/vswhere_usability_wrapper.cmd | 2 +- vcbuild.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/msvs/vswhere_usability_wrapper.cmd b/tools/msvs/vswhere_usability_wrapper.cmd index 0c7cac1e4c4aa2..45ca5b2164a3b3 100644 --- a/tools/msvs/vswhere_usability_wrapper.cmd +++ b/tools/msvs/vswhere_usability_wrapper.cmd @@ -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 diff --git a/vcbuild.bat b/vcbuild.bat index 179da60d2646a2..777842de209d11 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -250,7 +250,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 msbuild-not-found set "WIXSDKDIR=%WIX%\SDK\VS2017" if defined msi (