add support for vs2019

Author: MikeHolman

Build/Common.Build.Default.props

@@ -17,6 +17,7 @@
     <PlatformToolset Condition="'$(BuildToolVersion)'=='12.0'">v120</PlatformToolset>
     <PlatformToolset Condition="'$(BuildToolVersion)'=='14.0'">v140</PlatformToolset>
     <PlatformToolset Condition="'$(BuildToolVersion)'=='15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(BuildToolVersion)'=='16.0'">v142</PlatformToolset>
   </PropertyGroup>
 
   <!-- Default ChakraDevConfigDir -->

Build/scripts/add_msbuild_path.cmd

@@ -6,21 +6,48 @@
 :: add_msbuild_path.cmd
 ::
 :: Locate msbuild.exe and add it to the PATH
+@echo off
 set FORCE_MSBUILD_VERSION=%1
 
 if "%FORCE_MSBUILD_VERSION%" == "msbuild14" (
-    echo Skipping Dev15 and trying Dev14...
+    echo Skipping Dev16 and trying Dev14...
     goto :LABEL_USE_MSBUILD_14
 )
+if "%FORCE_MSBUILD_VERSION%" == "msbuild15" (
+    echo Skipping Dev16 and trying Dev15...
+    goto :LABEL_USE_MSBUILD_15
+)
 
 where /q msbuild.exe
 if "%ERRORLEVEL%" == "0" (
     goto :SkipMsBuildSetup
 )
 
-REM Try Dev15 first
+REM Try Dev16 first
+
+echo Trying to locate Dev16...
+
+:LABEL_USE_MSBUILD_16
+set MSBUILD_VERSION=16.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\2019\Enterprise\MSBuild\Current\Bin\x86"
+)
+
+if not exist "%MSBUILD_PATH%\msbuild.exe" (
+    set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
+)
+
+if not exist "%MSBUILD_PATH%\msbuild.exe" (
+    set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64"
+)
+
+if exist "%MSBUILD_PATH%\msbuild.exe" (
+    goto :MSBuildFound
+)
 
-echo Trying to locate Dev15...
+echo Dev16 not found, trying to locate Dev15...
 
 :LABEL_USE_MSBUILD_15
 set MSBUILD_VERSION=15.0

tools/run_msbuild.py

@@ -37,7 +37,9 @@ def main(sln, outdir, target_gen_dir, *flags):
     print "Visual Studio not found!!"
     return 1
 
-  msbuildPath = os.path.join(vsInstallRoot["path"], r"MSBuild\15.0\Bin\MSBuild.exe")
+  msbuildPath = os.path.join(vsInstallRoot["path"], r"MSBuild\Current\Bin\MSBuild.exe")
+  if not os.path.exists(msbuildPath):
+    msbuildPath = os.path.join(vsInstallRoot["path"], r"MSBuild\15.0\Bin\MSBuild.exe")
   args = [msbuildPath, os.path.normpath(sln)] + list(flags)
 
   print "== BUILDING CHAKRACORE:"