BDSX_CORE_VERSION=1.0.13.2

update to VS2022
bdsx · Jun 11, 2022 · da73ada · da73ada
1 parent be01697
commit da73ada
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 38 deletions.
diff --git a/INSTALL/INSTALL.vcxproj b/INSTALL/INSTALL.vcxproj
@@ -24,20 +24,20 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/bdsx-core.sln b/bdsx-core.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30711.63
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "(Solution Items)", "(Solution Items)", "{6EAAC25C-870D-46AD-B6CD-FCC6AED10026}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KEN", "KEN", "{723F917F-007
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KR3", "..\ken\KR3\KR3.vcxproj", "{F5212E7B-4791-4488-A23A-57AF3023E7D3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KRMySQL", "..\ken\KRMySQL\KRMySQL.vcxproj", "{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KRWin", "..\ken\KRWin\KRWin.vcxproj", "{432CC3C8-34B1-405D-9675-36FDF25289C7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "K2D", "..\ken\K2D\K2D.vcxproj", "{CC68C111-CA4B-42F6-B2A1-956420CE5D0F}"
@@ -59,12 +57,6 @@ Global
 		{F5212E7B-4791-4488-A23A-57AF3023E7D3}.Release|x64.Build.0 = ReleaseStatic|x64
 		{F5212E7B-4791-4488-A23A-57AF3023E7D3}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64
 		{F5212E7B-4791-4488-A23A-57AF3023E7D3}.ReleaseTest|x64.Build.0 = ReleaseTest|x64
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}.Debug|x64.ActiveCfg = DebugStatic|x64
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}.Debug|x64.Build.0 = DebugStatic|x64
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}.Release|x64.ActiveCfg = ReleaseStatic|x64
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}.Release|x64.Build.0 = ReleaseStatic|x64
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}.ReleaseTest|x64.ActiveCfg = ReleaseTest|x64
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666}.ReleaseTest|x64.Build.0 = ReleaseTest|x64
 		{432CC3C8-34B1-405D-9675-36FDF25289C7}.Debug|x64.ActiveCfg = DebugStatic|x64
 		{432CC3C8-34B1-405D-9675-36FDF25289C7}.Debug|x64.Build.0 = DebugStatic|x64
 		{432CC3C8-34B1-405D-9675-36FDF25289C7}.Release|x64.ActiveCfg = ReleaseStatic|x64
@@ -137,7 +129,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{F5212E7B-4791-4488-A23A-57AF3023E7D3} = {723F917F-0072-4B76-ABB1-3336381F001A}
-		{E25F0C5A-72CE-481E-8F08-C36AC5AD9666} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{432CC3C8-34B1-405D-9675-36FDF25289C7} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{CC68C111-CA4B-42F6-B2A1-956420CE5D0F} = {723F917F-0072-4B76-ABB1-3336381F001A}
 		{7102424C-18EC-4918-B6E1-1D58D1185387} = {723F917F-0072-4B76-ABB1-3336381F001A}

diff --git a/bdsx/bdsx.vcxproj b/bdsx/bdsx.vcxproj
@@ -24,20 +24,20 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseTest|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>

diff --git a/bdsx/main.cpp b/bdsx/main.cpp
@@ -18,7 +18,6 @@
 #include <KR3/win/windows.h>
 #include <KRWin/hook.h>
 #include <KR3/initializer.h>
-#include <KR3/util/unaligned.h>
 #include <KR3/net/socket.h>
 #include <KR3/util/StackWalker.h>
 #include <KR3/data/crypt.h>

diff --git a/bdsx/nativepointer.cpp b/bdsx/nativepointer.cpp
@@ -4,7 +4,6 @@
 #include "encoding.h"
 
 #include <string>
-#include <KR3/util/unaligned.h>
 
 using namespace kr;
 

diff --git a/bdsx/staticpointer.cpp b/bdsx/staticpointer.cpp
@@ -5,7 +5,6 @@
 #include "encoding.h"
 #include "vcstring.h"
 
-#include <KR3/util/unaligned.h>
 #include <KR3/win/handle.h>
 
 using namespace kr;

diff --git a/bdsx/version.bat b/bdsx/version.bat
@@ -1,2 +1,2 @@
 
-set BDSX_CORE_VERSION=1.0.13.1
+set BDSX_CORE_VERSION=1.0.13.2
diff --git a/bdsx/voidpointer.cpp b/bdsx/voidpointer.cpp
@@ -3,8 +3,6 @@
 
 #include "nativepointer.h"
 
-#include <KR3/util/unaligned.h>
-
 using namespace kr;
 
 VoidPointer::VoidPointer(const JsArguments& args) noexcept

diff --git a/chakra2chakracore/chakra2chakracore.vcxproj b/chakra2chakracore/chakra2chakracore.vcxproj
@@ -21,13 +21,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/node-chakracore b/node-chakracore
diff --git a/node-chakracore-build/build.bat b/node-chakracore-build/build.bat
@@ -14,7 +14,7 @@ if %found%==1 (
 )
 
 pushd "%SolutionDir%\node-chakracore"
-call vcbuild.bat %Config% vs2019 cctest
+call vcbuild.bat %Config% vs2022 cctest
 popd
 call :check_output
 if %found%==1 (

diff --git a/node-chakracore-build/node-chakracore-build.vcxproj b/node-chakracore-build/node-chakracore-build.vcxproj
@@ -21,13 +21,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/pdbcachegen/pdbcachegen.cpp b/pdbcachegen/pdbcachegen.cpp
@@ -142,7 +142,6 @@ int wmain(int argn, const wchar_t** args) {
 	size_t dupMax = 0;
 	for (Symbol& sym : symbols) {
 		uint32_t hash = hashString(sym.name);
-		if (sym.name == u"vsnprintf") debug();
 		uint32_t rva = intact<uint32_t>((uint64_t)sym.address - base);
 		if (hash == mainHash && sym.name == mainText) {
 			header.mainRva = rva;

diff --git a/pdbcachegen/pdbcachegen.vcxproj b/pdbcachegen/pdbcachegen.vcxproj
@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/pdbcachegen/pdbcachegen.vcxproj.user b/pdbcachegen/pdbcachegen.vcxproj.user
@@ -5,18 +5,18 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-f</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f ../../bdsx/bedrock_server/bedrock_server.exe ../../bdsx/bedrock_server/pdbcache.bin</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-f</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f ../../bdsx/bedrock_server/bedrock_server.exe ../../bdsx/bedrock_server/pdbcache.bin</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-f</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f ../../bdsx/bedrock_server/bedrock_server.exe ../../bdsx/bedrock_server/pdbcache.bin</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-f</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-f ../../bdsx/bedrock_server/bedrock_server.exe ../../bdsx/bedrock_server/pdbcache.bin</LocalDebuggerCommandArguments>
   </PropertyGroup>
 </Project>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		set BDSX_CORE_VERSION=1.0.13.1
		set BDSX_CORE_VERSION=1.0.13.2
+18 −2		tools/gyp/pylib/gyp/MSVSVersion.py
+1 −1		tools/msvs/vswhere_usability_wrapper.cmd
+43 −5		vcbuild.bat