general: Fixed up some vcxproj files which had a warning level set

Thus they did not get the same settings as all other projects which made it easy to introduce warnings which would trigger in xmake builds

Cleaned up some #include usage to use third-party include brackets

9 files changed, 21 insertions, 23 deletions

diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h
index 3367b39ef..6b9a0f658 100644
--- a/zencore/include/zencore/zencore.h
+++ b/zencore/include/zencore/zencore.h
@@ -63,11 +63,12 @@
 #if ZEN_COMPILER_MSC
 #	pragma warning(disable : 4324)	 // warning C4324: '<type>': structure was padded due to alignment specifier
 #	pragma warning(default : 4668)	 // warning C4668: 'symbol' is not defined as a preprocessor macro, replacing with '0' for 'directives'
+#	pragma warning(default : 4100)	 // warning C4100: 'identifier' : unreferenced formal parameter
 #endif
 
 #ifndef ZEN_THIRD_PARTY_INCLUDES_START
 #	if ZEN_COMPILER_MSC
-#		define ZEN_THIRD_PARTY_INCLUDES_START __pragma(warning(push)) __pragma(warning(disable : 4668))
+#		define ZEN_THIRD_PARTY_INCLUDES_START __pragma(warning(push)) __pragma(warning(disable : 4668 4127))
 #	else
 #		define ZEN_THIRD_PARTY_INCLUDES_START
 #	endif
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 1b731ed26..7b65cdc78 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1706,12 +1706,12 @@ TEST_CASE("zcache.policy")
 
 		zen::IoHash	   Key;
 		zen::IoHash	   PayloadId;
-		zen::CbPackage Package = GeneratePackage(Key, PayloadId);
-		auto		   Buf	   = ToBuffer(Package);
+		zen::CbPackage OriginalPackage = GeneratePackage(Key, PayloadId);
+		auto		   Buf			   = ToBuffer(OriginalPackage);
 
 		// Store package locally
 		{
-			CHECK(Package.GetAttachments().size() != 0);
+			CHECK(OriginalPackage.GetAttachments().size() != 0);
 			cpr::Response Result = cpr::Put(cpr::Url{"{}/{}/{}"_format(LocalCfg.BaseUri, Bucket, Key)},
 											cpr::Body{(const char*)Buf.GetData(), Buf.GetSize()},
 											cpr::Header{{"Content-Type", "application/x-ue-cbpkg"}});
@@ -1763,12 +1763,12 @@ TEST_CASE("zcache.policy")
 
 		zen::IoHash	   Key;
 		zen::IoHash	   PayloadId;
-		zen::CbPackage Package = GeneratePackage(Key, PayloadId);
-		auto		   Buf	   = ToBuffer(Package);
+		zen::CbPackage OriginalPackage = GeneratePackage(Key, PayloadId);
+		auto		   Buf			   = ToBuffer(OriginalPackage);
 
 		// Store package upstream
 		{
-			CHECK(Package.GetAttachments().size() != 0);
+			CHECK(OriginalPackage.GetAttachments().size() != 0);
 			cpr::Response Result = cpr::Put(cpr::Url{"{}/{}/{}"_format(UpstreamCfg.BaseUri, Bucket, Key)},
 											cpr::Body{(const char*)Buf.GetData(), Buf.GetSize()},
 											cpr::Header{{"Content-Type", "application/x-ue-cbpkg"}});
diff --git a/zenserver-test/zenserver-test.vcxproj b/zenserver-test/zenserver-test.vcxproj
index a39fce7ec..d632e395e 100644
--- a/zenserver-test/zenserver-test.vcxproj
+++ b/zenserver-test/zenserver-test.vcxproj
@@ -67,7 +67,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
@@ -79,7 +78,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h
index cf22b8be2..da3e74126 100644
--- a/zenserver/cache/structuredcachestore.h
+++ b/zenserver/cache/structuredcachestore.h
@@ -10,10 +10,9 @@
 #include <zenstore/cas.h>
 #include <zenstore/gc.h>
 
-#pragma warning(push)
-#pragma warning(disable : 4127)
+ZEN_THIRD_PARTY_INCLUDES_START
 #include <tsl/robin_map.h>
-#pragma warning(pop)
+ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <compare>
 #include <filesystem>
diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h
index c9f49217a..83d3986bb 100644
--- a/zenserver/projectstore.h
+++ b/zenserver/projectstore.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <zencore/logging.h>
 #include <zencore/uid.h>
 #include <zencore/xxhash.h>
 #include <zenhttp/httpserver.h>
@@ -9,13 +10,15 @@
 #include <zenstore/caslog.h>
 #include <zenstore/cidstore.h>
 
-#include <tsl/robin_map.h>
-#include <zencore/logging.h>
 #include <filesystem>
 #include <map>
 #include <optional>
 #include <string>
 
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <tsl/robin_map.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 namespace zen {
 
 class CbPackage;
diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h
index 12e46bd8d..7f55294ce 100644
--- a/zenserver/upstream/zen.h
+++ b/zenserver/upstream/zen.h
@@ -10,12 +10,10 @@
 #include <zencore/uid.h>
 #include <zencore/zencore.h>
 
-#pragma warning(push)
-#pragma warning(disable : 4127)
+ZEN_THIRD_PARTY_INCLUDES_START
 #include <tsl/robin_map.h>
-#pragma warning(pop)
-
 #include <asio.hpp>
+ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <chrono>
 
diff --git a/zenstore/include/zenstore/cidstore.h b/zenstore/include/zenstore/cidstore.h
index 5f567e7fc..acfedbc64 100644
--- a/zenstore/include/zenstore/cidstore.h
+++ b/zenstore/include/zenstore/cidstore.h
@@ -4,10 +4,13 @@
 
 #include "zenstore.h"
 
-#include <tsl/robin_map.h>
 #include <zencore/iohash.h>
 #include <zenstore/CAS.h>
 
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <tsl/robin_map.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 namespace std::filesystem {
 class path;
 }
diff --git a/zenstore/zenstore.vcxproj b/zenstore/zenstore.vcxproj
index eb2ecd02b..832ea8159 100644
--- a/zenstore/zenstore.vcxproj
+++ b/zenstore/zenstore.vcxproj
@@ -97,7 +97,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
@@ -111,7 +110,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
diff --git a/zenutil/zenutil.vcxproj b/zenutil/zenutil.vcxproj
index 3bf6111f7..20f803e2a 100644
--- a/zenutil/zenutil.vcxproj
+++ b/zenutil/zenutil.vcxproj
@@ -68,7 +68,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
@@ -81,7 +80,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>