Merge pull request #965 from xPaw/proto

Update nethook to protobuf-2.6.1
SteamRE · Mar 22, 2021 · 64fc15e · 64fc15e
2 parents f894efc + bca7034
commit 64fc15e
Show file tree

Hide file tree

Showing 6 changed files with 16,781 additions and 3,257 deletions.
diff --git a/Resources/NetHook2/BuildDependencies.cmd b/Resources/NetHook2/BuildDependencies.cmd
@@ -14,16 +14,16 @@ if not exist "native-dependencies\zlib-bins\ALL_BUILD.vcxproj" (
 
 msbuild native-dependencies\zlib-bins\ALL_BUILD.vcxproj /p:Configuration=Release
 
-if not exist "native-dependencies\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj" (
-  devenv /upgrade native-dependencies\protobuf-2.5.0\vsprojects\protobuf.sln
+if not exist "native-dependencies\protobuf-2.6.1\vsprojects\libprotobuf.vcxproj" (
+  devenv /upgrade native-dependencies\protobuf-2.6.1\vsprojects\protobuf.sln
 )
 
-if not exist "native-dependencies\protobuf-2.5.0\vsprojects\Directory.Build.props" (
-  copy protobuf-Directory.Build.props native-dependencies\protobuf-2.5.0\vsprojects\Directory.Build.props
+if not exist "native-dependencies\protobuf-2.6.1\vsprojects\Directory.Build.props" (
+  copy protobuf-Directory.Build.props native-dependencies\protobuf-2.6.1\vsprojects\Directory.Build.props
 )
 
-msbuild native-dependencies\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj /p:Configuration=Debug
-msbuild native-dependencies\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj /p:Configuration=Release
+msbuild native-dependencies\protobuf-2.6.1\vsprojects\libprotobuf.vcxproj /p:Configuration=Debug
+msbuild native-dependencies\protobuf-2.6.1\vsprojects\libprotobuf.vcxproj /p:Configuration=Release
 
 rem todo: compile protoc and generate steammessages_base.pb.{h|cpp}
 

diff --git a/Resources/NetHook2/InstallDependencies.ps1 b/Resources/NetHook2/InstallDependencies.ps1
@@ -4,9 +4,10 @@ $NetHook2DependenciesTemporaryDirectory = Join-Path ([System.IO.Path]::GetTempPa
 $ZLibSourceZipUrl = "http://zlib.net/zlib1211.zip"
 $ZLibSourceFile = [System.IO.Path]::Combine($NetHook2DependenciesTemporaryDirectory, "zlib-1.2.11.zip")
 $ZLibSourceInnerFolderName = "zlib-1.2.11"
-$ProtobufSourceZipUrl = "https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.zip"
-$ProtobufSourceFile = [System.IO.Path]::Combine($NetHook2DependenciesTemporaryDirectory, "protobuf-2.5.0.zip")
-$ProtobufSourceInnerFolderName = "protobuf-2.5.0"
+$ProtobufVersion = "2.6.1"
+$ProtobufSourceZipUrl = "https://github.com/google/protobuf/releases/download/v$ProtobufVersion/protobuf-$ProtobufVersion.zip"
+$ProtobufSourceFile = [System.IO.Path]::Combine($NetHook2DependenciesTemporaryDirectory, "protobuf-$ProtobufVersion.zip")
+$ProtobufSourceInnerFolderName = "protobuf-$ProtobufVersion"
 
 Set-Location $PSScriptRoot
 

diff --git a/Resources/NetHook2/NetHook2/NetHook2.vcxproj b/Resources/NetHook2/NetHook2/NetHook2.vcxproj
@@ -50,7 +50,7 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <ZLibVersion>1.2.11</ZLibVersion>
-    <ProtobufVersion>2.5.0</ProtobufVersion>
+    <ProtobufVersion>2.6.1</ProtobufVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>