Upgrade build scripts to support VS2019. (#17269)

Changes will default Windows SDK version as well as Platform Toolset to
the default versions used in the targeted VS version. If the projects are
opened up in VS2015, it should default to Windows SDK 8.1 and v140, but if
the same projects are opened in VS2019, it will default to latest Windows SDK 10
and v142. This way the project files should adapt to used VS version, meaning
that we could still build them using VS2015 (what's currently used on CI) but also
using VS2017 and VS2019. There should not be a need to install any previous versions
of build tools, unless an older version is targeted. It is also possible to set
PlatformToolset when calling msbuild and that should adapt to corresponding default
Windows SDK version for targeted toolset version.

Commit makes many changes and adjustments, aligning all vcxproj files but changes
should not affect build output.

1 files changed, 96 insertions, 41 deletions

diff --git a/msvc/setup-vs-msvcbuild-env.bat b/msvc/setup-vs-msvcbuild-env.bat
index 88557fe0486..64383200efc 100755
--- a/msvc/setup-vs-msvcbuild-env.bat
+++ b/msvc/setup-vs-msvcbuild-env.bat
@@ -9,21 +9,26 @@ set CALLER_WD=%CD%
 set RUN_SETUP_VS_MSVCBUILD_ENV_SCRIPT_PATH=%~dp0

 

 :: NOTE, MSVC build Mono full AOT tooling currently support 64-bit AMD codegen. Below will only setup

-:: amd64 versions of VS MSVC build environment and corresponding ClangC2 compiler.

+:: amd64 versions of VS MSVC build environment and corresponding Clang compiler.

 set VS_2015_TOOLCHAIN_ARCH=amd64

 set VS_2015_VCVARS_ARCH=%VS_2015_TOOLCHAIN_ARCH%\vcvars64.bat

-set VS_2015_CLANGC2_ARCH=%VS_2015_TOOLCHAIN_ARCH%

+set VS_2015_CLANG_ARCH=%VS_2015_TOOLCHAIN_ARCH%

 set VS_2017_VCVARS_ARCH=vcvars64.bat

-set VS_2017_CLANGC2_ARCH=HostX64

+set VS_2017_CLANG_ARCH=HostX64

+set VS_2019_VCVARS_ARCH=%VS_2017_VCVARS_ARCH%

 

 :: 32-bit AOT toolchains for MSVC build mono-sgen.exe is currently not supported.

 :: set VS_2015_TOOLCHAIN_ARCH=x86

 :: set VS_2015_VCVARS_ARCH=vcvars32.bat

-:: set VS_2015_CLANGC2_ARCH=%VS_2015_TOOLCHAIN_ARCH%

+:: set VS_2015_CLANG_ARCH=%VS_2015_TOOLCHAIN_ARCH%

 :: set VS_2017_VCVARS_ARCH=vcvars32.bat

-:: set VS_2017_CLANGC2_ARCH=HostX86

+:: set VS_2017_CLANG_ARCH=HostX86

+:: set VS_2019_VCVARS_ARCH=%VS_2017_VCVARS_ARCH%

 

-set VS_CLANGC2_TOOLS_BIN_PATH=

+set VS_CLANG_TOOLS_BIN_PATH=

+

+:: VS2019/VS2017 includes vswhere.exe that can be used to locate current VS installation.

+set VSWHERE_TOOLS_BIN=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe

 

 :: Visual Studio 2015 == 14.0

 if "%VisualStudioVersion%" == "14.0" (

@@ -35,64 +40,76 @@ if "%VisualStudioVersion%" == "15.0" (
     goto SETUP_VS_2017

 )

 

-:SETUP_VS_2015

+:: Visual Studio 2019 == 16.0

+if "%VisualStudioVersion%" == "16.0" (

+    goto SETUP_VS_2019

+)

 

-set VS_2015_VCINSTALL_DIR=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\

+:SETUP_VS_2019

 

-:: Try to locate installed VS2015 Clang/C2.

-SET VS_2015_CLANGC2_TOOLS_BIN_PATH=%VS_2015_VCINSTALL_DIR%ClangC2\bin\%VS_2015_CLANGC2_ARCH%\

-SET VS_2015_CLANGC2_TOOLS_BIN=%VS_2015_CLANGC2_TOOLS_BIN_PATH%clang.exe

+set VS_2019_VCINSTALL_DIR=

 

-if not exist "%VS_2015_CLANGC2_TOOLS_BIN%" (

-    goto SETUP_VS_2017

+:: Try to locate installed VS2019 VC environment.

+if exist "%VSWHERE_TOOLS_BIN%" (

+    for /f "tokens=*" %%a in ('"%VSWHERE_TOOLS_BIN%" -version [16.0^,17.0] -property installationPath') do (

+        set VS_2019_VCINSTALL_DIR=%%a\VC\

+    )

 )

 

-:SETUP_VS_2015_BUILD_TOOLS

+:: Try to locate installed VS2019 Clang.

+set VS_2019_CLANG_TOOLS_BIN_PATH=%VS_2019_VCINSTALL_DIR%Tools\llvm\bin\

+set VS_2019_CLANG_TOOLS_BIN=%VS_2019_CLANG_TOOLS_BIN_PATH%clang.exe

+if not exist "%VS_2019_CLANG_TOOLS_BIN%" (

+	goto SETUP_VS_2017

+)

 

-:: Try to locate VS2015 build tools installation.

-set VS_2015_BUILD_TOOLS_INSTALL_DIR=%ProgramFiles(x86)%\Microsoft Visual C++ Build Tools\

-set VS_2015_BUILD_TOOLS_CMD=%VS_2015_BUILD_TOOLS_INSTALL_DIR%vcbuildtools.bat

+:SETUP_VS_2019_BUILD_TOOLS

 

-:: Setup VS2015 VC development environment using build tools installation.

-call :setup_build_env "%VS_2015_BUILD_TOOLS_CMD%" "%VS_2015_TOOLCHAIN_ARCH%" "%CALLER_WD%" && (

-    set "VS_CLANGC2_TOOLS_BIN_PATH=%VS_2015_CLANGC2_TOOLS_BIN_PATH%"

+:: Try to locate VS2019 build tools installation.

+set VS_2019_BUILD_TOOLS_INSTALL_DIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\

+set VS_2019_BUILD_TOOLS_CMD=%VS_2019_BUILD_TOOLS_INSTALL_DIR%VC\Auxiliary\Build\%VS_2019_VCVARS_ARCH%

+

+:: Setup VS2019 VC development environment using build tools installation.

+call :setup_build_env "%VS_2019_BUILD_TOOLS_CMD%" "" "%CALLER_WD%" && (

+    set "VS_CLANG_TOOLS_BIN_PATH=%VS_2019_CLANG_TOOLS_BIN_PATH%"

+    set VS_DEFAULT_PLATFORM_TOOL_SET=v142

     goto ON_EXIT

 )

 

-:SETUP_VS_2015_VC

+:SETUP_VS_2019_VC

 

-:: Try to locate installed VS2015 VC environment.

-set VS_2015_DEV_CMD=%VS_2015_VCINSTALL_DIR%bin\%VS_2015_VCVARS_ARCH%

+:: Try to locate installed VS2019 VC environment.

+set VS_2019_DEV_CMD=%VS_2019_VCINSTALL_DIR%Auxiliary\Build\%VS_2019_VCVARS_ARCH%

 

-call :setup_build_env "%VS_2015_DEV_CMD%" "" "%CALLER_WD%" && (

-    set "VS_CLANGC2_TOOLS_BIN_PATH=%VS_2015_CLANGC2_TOOLS_BIN_PATH%"

+:: Setup VS2019 VC development environment using VS installation.

+call :setup_build_env "%VS_2019_DEV_CMD%" "" "%CALLER_WD%" && (

+    set "VS_CLANG_TOOLS_BIN_PATH=%VS_2017_CLANG_TOOLS_BIN_PATH%"

+    set VS_DEFAULT_PLATFORM_TOOL_SET=v142

     goto ON_EXIT

 )

 

 :SETUP_VS_2017

 

-:: VS2017 includes vswhere.exe that can be used to locate current VS2017 installation.

-set VSWHERE_TOOLS_BIN=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe

 set VS_2017_VCINSTALL_DIR=

 

 :: Try to locate installed VS2017 VC environment.

 if exist "%VSWHERE_TOOLS_BIN%" (

-    for /f "tokens=*" %%a in ('"%VSWHERE_TOOLS_BIN%" -latest -property installationPath') do (

+    for /f "tokens=*" %%a in ('"%VSWHERE_TOOLS_BIN%" -version [15.0^,16.0] -property installationPath') do (

         set VS_2017_VCINSTALL_DIR=%%a\VC\

     )

 )

 

-:: Try to locate installed VS2017 Clang/C2.

-SET VS_2017_CLANGC2_VERSION_FILE=%VS_2017_VCINSTALL_DIR%Auxiliary/Build/Microsoft.ClangC2Version.default.txt

-if not exist "%VS_2017_CLANGC2_VERSION_FILE%" (

-	goto ON_ENV_ERROR

+:: Try to locate installed VS2017 Clang.

+SET VS_2017_CLANG_VERSION_FILE=%VS_2017_VCINSTALL_DIR%Auxiliary/Build/Microsoft.ClangC2Version.default.txt

+if not exist "%VS_2017_CLANG_VERSION_FILE%" (

+	goto SETUP_VS_2015

 )

 

-set /p VS_2017_CLANGC2_VERSION=<"%VS_2017_CLANGC2_VERSION_FILE%"

-set VS_2017_CLANGC2_TOOLS_BIN_PATH=%VS_2017_VCINSTALL_DIR%Tools\ClangC2\%VS_2017_CLANGC2_VERSION%\bin\%VS_2017_CLANGC2_ARCH%\

-set VS_2017_CLANGC2_TOOLS_BIN=%VS_2017_CLANGC2_TOOLS_BIN_PATH%clang.exe

-if not exist "%VS_2017_CLANGC2_TOOLS_BIN%" (

-	goto ON_ENV_ERROR

+set /p VS_2017_CLANG_VERSION=<"%VS_2017_CLANG_VERSION_FILE%"

+set VS_2017_CLANG_TOOLS_BIN_PATH=%VS_2017_VCINSTALL_DIR%Tools\ClangC2\%VS_2017_CLANG_VERSION%\bin\%VS_2017_CLANG_ARCH%\

+set VS_2017_CLANG_TOOLS_BIN=%VS_2017_CLANG_TOOLS_BIN_PATH%clang.exe

+if not exist "%VS_2017_CLANG_TOOLS_BIN%" (

+	goto SETUP_VS_2015

 )

 

 :SETUP_VS_2017_BUILD_TOOLS

@@ -103,7 +120,8 @@ set VS_2017_BUILD_TOOLS_CMD=%VS_2017_BUILD_TOOLS_INSTALL_DIR%VC\Auxiliary\Build\
 

 :: Setup VS2017 VC development environment using build tools installation.

 call :setup_build_env "%VS_2017_BUILD_TOOLS_CMD%" "" "%CALLER_WD%" && (

-    set "VS_CLANGC2_TOOLS_BIN_PATH=%VS_2017_CLANGC2_TOOLS_BIN_PATH%"

+    set "VS_CLANG_TOOLS_BIN_PATH=%VS_2017_CLANG_TOOLS_BIN_PATH%"

+    set VS_DEFAULT_PLATFORM_TOOL_SET=v141

     goto ON_EXIT

 )

 

@@ -114,7 +132,44 @@ set VS_2017_DEV_CMD=%VS_2017_VCINSTALL_DIR%Auxiliary\Build\%VS_2017_VCVARS_ARCH%
 

 :: Setup VS2017 VC development environment using VS installation.

 call :setup_build_env "%VS_2017_DEV_CMD%" "" "%CALLER_WD%" && (

-    set "VS_CLANGC2_TOOLS_BIN_PATH=%VS_2017_CLANGC2_TOOLS_BIN_PATH%"

+    set "VS_CLANG_TOOLS_BIN_PATH=%VS_2017_CLANG_TOOLS_BIN_PATH%"

+    set VS_DEFAULT_PLATFORM_TOOL_SET=v141

+    goto ON_EXIT

+)

+

+:SETUP_VS_2015

+

+set VS_2015_VCINSTALL_DIR=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\

+

+:: Try to locate installed VS2015 Clang.

+SET VS_2015_CLANG_TOOLS_BIN_PATH=%VS_2015_VCINSTALL_DIR%ClangC2\bin\%VS_2015_CLANG_ARCH%\

+SET VS_2015_CLANG_TOOLS_BIN=%VS_2015_CLANG_TOOLS_BIN_PATH%clang.exe

+

+if not exist "%VS_2015_CLANG_TOOLS_BIN%" (

+    goto ON_ENV_ERROR

+)

+

+:SETUP_VS_2015_BUILD_TOOLS

+

+:: Try to locate VS2015 build tools installation.

+set VS_2015_BUILD_TOOLS_INSTALL_DIR=%ProgramFiles(x86)%\Microsoft Visual C++ Build Tools\

+set VS_2015_BUILD_TOOLS_CMD=%VS_2015_BUILD_TOOLS_INSTALL_DIR%vcbuildtools.bat

+

+:: Setup VS2015 VC development environment using build tools installation.

+call :setup_build_env "%VS_2015_BUILD_TOOLS_CMD%" "%VS_2015_TOOLCHAIN_ARCH%" "%CALLER_WD%" && (

+    set "VS_CLANG_TOOLS_BIN_PATH=%VS_2015_CLANG_TOOLS_BIN_PATH%"

+    set VS_DEFAULT_PLATFORM_TOOL_SET=v140

+    goto ON_EXIT

+)

+

+:SETUP_VS_2015_VC

+

+:: Try to locate installed VS2015 VC environment.

+set VS_2015_DEV_CMD=%VS_2015_VCINSTALL_DIR%bin\%VS_2015_VCVARS_ARCH%

+

+call :setup_build_env "%VS_2015_DEV_CMD%" "" "%CALLER_WD%" && (

+    set "VS_CLANG_TOOLS_BIN_PATH=%VS_2015_CLANG_TOOLS_BIN_PATH%"

+    set VS_DEFAULT_PLATFORM_TOOL_SET=v140

     goto ON_EXIT

 )

 

@@ -128,8 +183,8 @@ exit /b 1
 

 :ON_EXIT

 

-:: Add ClangC2 folders to PATH

-set "PATH=%VS_CLANGC2_TOOLS_BIN_PATH%;%PATH%"

+:: Add Clang folders to PATH

+set "PATH=%VS_CLANG_TOOLS_BIN_PATH%;%PATH%"

 

 exit /b 0