Merge branch 'ni:main' into fixInfJSONParsing

ni · Jul 16, 2024 · 17d9a8e · 17d9a8e
2 parents b90a05a + 3f0aab6
commit 17d9a8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Vireo_VS/VireoCommandLine.vcxproj b/Vireo_VS/VireoCommandLine.vcxproj
@@ -116,13 +116,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>

diff --git a/docs/Build.md b/docs/Build.md
@@ -92,7 +92,7 @@ Notice that vireo.js is created in the `dist` folder based on the `BUILD` type.
 
 - Visual Studio 2022 with C++ support, specifically:
   - Windows 10 SDK (10.0.20348.0)
-  - MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16)
+  - MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.29)
 
 ### Building Vireo Windows Native