-@REM check and set VS2017 environment\r
-rem VS2017U2 contains vswhere.exe\r
+@REM check and set Visual Studio environment\r
+rem There is vswhere.exe starting VS2017U2\r
if "%VSWHERE%"=="" set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"\r
\r
rem Use %ProgramFiles% in a 32-bit program prior to Windows 10)\r
\r
If Not Exist "%VSWHERE%" (\r
echo "WARNING: Can't find vswhere.exe. It is a part of VS 2017 version 15.2 or later. Trying known path..."\r
- set "InstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"\r
+ set "InstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"\r
) ELSE (\r
for /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (\r
set InstallDir=%%i\r
)\r
\r
echo Install dir is "%InstallDir%"\r
-if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (\r
- set msbuild="%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe"\r
+if exist "%InstallDir%\MSBuild\Current\Bin\MSBuild.exe" (\r
+ set msbuild="%InstallDir%\MSBuild\Current\Bin\MSBuild.exe"\r
)\r