Add support of Visual Studio 2019

Taritsyn · Taritsyn · commit 7cab0d0a3c72 · 2019-06-16T15:54:25.000+03:00
diff --git a/ClearScript/V8/ClearScriptV8/32/ClearScriptV8-32.vcxproj b/ClearScript/V8/ClearScriptV8/32/ClearScriptV8-32.vcxproj
@@ -29,14 +29,18 @@
     <CLRSupport>true</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0'">
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='16.0'" Label="VS2019 toolset selection">
+    <PlatformToolset>v142</PlatformToolset>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0'" Label="VS2017 toolset selection">
     <PlatformToolset>v141</PlatformToolset>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)'=='14.0'">
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='14.0'" Label="VS2015 toolset selection">
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)'=='12.0'">
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='12.0'" Label="VS2013 toolset selection">
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/ClearScript/V8/ClearScriptV8/64/ClearScriptV8-64.vcxproj b/ClearScript/V8/ClearScriptV8/64/ClearScriptV8-64.vcxproj
@@ -29,14 +29,18 @@
     <CLRSupport>true</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0'">
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='16.0'" Label="VS2019 toolset selection">
+    <PlatformToolset>v142</PlatformToolset>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0'" Label="VS2017 toolset selection">
     <PlatformToolset>v141</PlatformToolset>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)'=='14.0'">
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='14.0'" Label="VS2015 toolset selection">
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)'=='12.0'">
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='12.0'" Label="VS2013 toolset selection">
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/V8Update.cmd b/V8Update.cmd
@@ -73,11 +73,11 @@ goto Exit
 :CheckOSDone
 
 :CheckMSVS
-if "%VisualStudioVersion%"=="15.0" goto UseMSVS2017
-echo Error: This script requires a Visual Studio 2017 Developer Command Prompt.
+if "%VisualStudioVersion%"=="15.0" goto CheckMSVSDone
+if "%VisualStudioVersion%"=="16.0" goto CheckMSVSDone
+echo Error: This script requires a Visual Studio 2017 or 2019 Developer Command Prompt.
 echo Browse to http://www.visualstudio.com for more information.
 goto Exit
-:UseMSVS2017
 :CheckMSVSDone
 
 ::-----------------------------------------------------------------------------
