|
|
@@ -1,5 +1,6 @@
|
|
|
::-------------------------------------------------------------------------------------------------------
|
|
|
:: Copyright (C) Microsoft. All rights reserved.
|
|
|
+:: Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
|
|
|
:: Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
|
|
|
::-------------------------------------------------------------------------------------------------------
|
|
|
|
|
|
@@ -10,22 +11,48 @@
|
|
|
set FORCE_MSBUILD_VERSION=%1
|
|
|
|
|
|
if "%FORCE_MSBUILD_VERSION%" == "msbuild14" (
|
|
|
- echo Skipping Dev16 and trying Dev14...
|
|
|
+ echo Skipping Dev17 and trying Dev14...
|
|
|
goto :LABEL_USE_MSBUILD_14
|
|
|
)
|
|
|
if "%FORCE_MSBUILD_VERSION%" == "msbuild15" (
|
|
|
- echo Skipping Dev16 and trying Dev15...
|
|
|
+ echo Skipping Dev17 and trying Dev15...
|
|
|
goto :LABEL_USE_MSBUILD_15
|
|
|
)
|
|
|
+if "%FORCE_MSBUILD_VERSION%" == "msbuild16" (
|
|
|
+ echo Skipping Dev17 and trying Dev16...
|
|
|
+ goto :LABEL_USE_MSBUILD_16
|
|
|
+)
|
|
|
|
|
|
where /q msbuild.exe
|
|
|
if "%ERRORLEVEL%" == "0" (
|
|
|
goto :SkipMsBuildSetup
|
|
|
)
|
|
|
|
|
|
-REM Try Dev16 first
|
|
|
+REM Try Dev17 first, then older versions
|
|
|
+
|
|
|
+echo Trying to locate Dev17...
|
|
|
+
|
|
|
+:LABEL_USE_MSBUILD_17
|
|
|
+set MSBUILD_VERSION=17.0
|
|
|
+set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\Enterprise\MSBuild\%MSBUILD_VERSION%\Bin"
|
|
|
+
|
|
|
+if not exist "%MSBUILD_PATH%\msbuild.exe" (
|
|
|
+ set "MSBUILD_PATH=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\amd64"
|
|
|
+)
|
|
|
+
|
|
|
+if not exist "%MSBUILD_PATH%\msbuild.exe" (
|
|
|
+ set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
|
|
|
+)
|
|
|
+
|
|
|
+if not exist "%MSBUILD_PATH%\msbuild.exe" (
|
|
|
+ set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\amd64"
|
|
|
+)
|
|
|
+
|
|
|
+if exist "%MSBUILD_PATH%\msbuild.exe" (
|
|
|
+ goto :MSBuildFound
|
|
|
+)
|
|
|
|
|
|
-echo Trying to locate Dev16...
|
|
|
+echo Dev17 not found, trying to locate Dev16...
|
|
|
|
|
|
:LABEL_USE_MSBUILD_16
|
|
|
set MSBUILD_VERSION=16.0
|