From 911ca7f9953c8fa32f9816a332c7bc95159df05e Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Mon, 14 Nov 2022 19:27:37 +0200 Subject: [PATCH] Support MSBuild in preview version Visual Studio in build scripts --- Development/Scripts/Windows/GetMSBuildPath.bat | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Development/Scripts/Windows/GetMSBuildPath.bat b/Development/Scripts/Windows/GetMSBuildPath.bat index 4945c1015..fac1db727 100644 --- a/Development/Scripts/Windows/GetMSBuildPath.bat +++ b/Development/Scripts/Windows/GetMSBuildPath.bat @@ -11,6 +11,16 @@ for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer goto End ) ) +for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -property installationPath') do ( + if exist "%%i\MSBuild\15.0\Bin\MSBuild.exe" ( + set MSBUILD_PATH="%%i\MSBuild\15.0\Bin\MSBuild.exe" + goto End + ) + if exist "%%i\MSBuild\Current\Bin\MSBuild.exe" ( + set MSBUILD_PATH="%%i\MSBuild\Current\Bin\MSBuild.exe" + goto End + ) +) :VsWhereNotFound if exist "%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" (