From d921989440dbea76f34c3917cf9c55e298693348 Mon Sep 17 00:00:00 2001 From: Changhua Date: Sun, 29 Dec 2024 15:23:24 +0800 Subject: [PATCH 1/5] Fix include path --- WeChatFerry/spy/Spy.vcxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WeChatFerry/spy/Spy.vcxproj b/WeChatFerry/spy/Spy.vcxproj index bf90736..17b983b 100644 --- a/WeChatFerry/spy/Spy.vcxproj +++ b/WeChatFerry/spy/Spy.vcxproj @@ -92,7 +92,7 @@ stdcpp17 - $(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include + $(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;$(SolutionDir)vcpkg_installed\x64-windows-static\x64-windows-static\include true false MultiThreaded @@ -140,7 +140,7 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry stdcpp17 - $(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include + $(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;$(SolutionDir)vcpkg_installed\x64-windows-static\x64-windows-static\include true false MultiThreaded @@ -191,7 +191,7 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry stdcpp17 - $(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include + $(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;$(SolutionDir)vcpkg_installed\x64-windows-static\x64-windows-static\include false 4251;4731;4819 From 915c7330635cf3553f20195602f3c5d863a56738 Mon Sep 17 00:00:00 2001 From: Changhua Date: Sun, 29 Dec 2024 16:50:08 +0800 Subject: [PATCH 2/5] Fix github action --- .github/workflows/Build-WeChatFerry.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Build-WeChatFerry.yml b/.github/workflows/Build-WeChatFerry.yml index 9502122..4566301 100644 --- a/.github/workflows/Build-WeChatFerry.yml +++ b/.github/workflows/Build-WeChatFerry.yml @@ -46,9 +46,9 @@ jobs: path: | C:/Tools/vcpkg ${{ github.workspace }}/WeChatFerry/vcpkg_installed - key: ${{ runner.os }}-vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }} + key: vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }} restore-keys: | - ${{ runner.os }}-vcpkg- + vcpkg- - name: 安装 vcpkg 并初始化依赖项 run: | @@ -68,19 +68,24 @@ jobs: echo "VCPKG_ROOT=C:/Tools/vcpkg" >> $GITHUB_ENV $env:VCPKG_ROOT = 'C:/Tools/vcpkg' - # 将 vcpkg 与 Visual Studio 集成 - C:/Tools/vcpkg/vcpkg integrate install - # 返回到项目目录并安装依赖 cd ${{ github.workspace }}/WeChatFerry - C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static + C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static --manifest + + # 将 vcpkg 与 Visual Studio 集成 + C:/Tools/vcpkg/vcpkg integrate install - name: 解析并构建配置 run: | $configurations = "Release,Debug".Split(',') foreach ($config in $configurations) { Write-Host "Building configuration: $config" - msbuild WeChatFerry/WeChatFerry.sln /p:Configuration=$config /p:Platform="x64" /p:VcpkgTriplet="x64-windows-static" /p:VcpkgEnableManifest=true /verbosity:minimal + msbuild WeChatFerry/WeChatFerry.sln ` + /p:Configuration=$config ` + /p:Platform="x64" ` + /p:VcpkgTriplet="x64-windows-static" ` + /p:VcpkgEnableManifest=true ` + /verbosity:minimal } shell: pwsh From a77b3bdfa4fe8b8b52bd5c35061046fbe79b42dd Mon Sep 17 00:00:00 2001 From: Changhua Date: Mon, 30 Dec 2024 08:52:46 +0800 Subject: [PATCH 3/5] Fix github action --- .github/workflows/Build-WeChatFerry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build-WeChatFerry.yml b/.github/workflows/Build-WeChatFerry.yml index 4566301..1991b84 100644 --- a/.github/workflows/Build-WeChatFerry.yml +++ b/.github/workflows/Build-WeChatFerry.yml @@ -70,7 +70,7 @@ jobs: # 返回到项目目录并安装依赖 cd ${{ github.workspace }}/WeChatFerry - C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static --manifest + C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static # 将 vcpkg 与 Visual Studio 集成 C:/Tools/vcpkg/vcpkg integrate install From 66813b186c3a7f590ec4002841f70d07d0588c75 Mon Sep 17 00:00:00 2001 From: Changhua Date: Mon, 30 Dec 2024 15:42:35 +0800 Subject: [PATCH 4/5] Fix include path --- WeChatFerry/spy/rpc_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WeChatFerry/spy/rpc_server.cpp b/WeChatFerry/spy/rpc_server.cpp index 70e899b..d033730 100644 --- a/WeChatFerry/spy/rpc_server.cpp +++ b/WeChatFerry/spy/rpc_server.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include From 0dbe4cdf75c4d0848d9e603e6c3a65bc8d045d77 Mon Sep 17 00:00:00 2001 From: Changhua Date: Mon, 30 Dec 2024 15:44:08 +0800 Subject: [PATCH 5/5] Add builtin-baseline --- WeChatFerry/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WeChatFerry/vcpkg.json b/WeChatFerry/vcpkg.json index d831f6d..d735952 100644 --- a/WeChatFerry/vcpkg.json +++ b/WeChatFerry/vcpkg.json @@ -10,5 +10,6 @@ "nng", "magic-enum", "minhook" - ] + ], + "builtin-baseline": "80d54ff62d528339c626a6fbc3489a7f25956ade" }