diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 3c00149..adeb166 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -131,7 +131,8 @@ jobs: /v:minimal $arch = $cfg.Arch - $exeSrc = "src-csharp/RDPOffsetFinder/RDPWrapOffsetFinder/$($cfg.Platform)/Release/RDPWrapOffsetFinder.exe" + # .sln build outputs to SolutionDir//Release/ (not //Release/) + $exeSrc = "src-csharp/RDPOffsetFinder/$($cfg.Platform)/Release/RDPWrapOffsetFinder.exe" $dllSrc = "src-csharp/RDPOffsetFinder/zydis/msvc/bin/$($cfg.ZydisBin)/Zydis.dll" Copy-Item $exeSrc ".\RDPWrapOffsetFinder_$arch.exe" Copy-Item $dllSrc ".\Zydis_$arch.dll" diff --git a/.github/workflows/build-cpp.yml b/.github/workflows/build-cpp.yml index 0aab122..e0c2d36 100644 --- a/.github/workflows/build-cpp.yml +++ b/.github/workflows/build-cpp.yml @@ -7,8 +7,6 @@ on: pull_request: branches: [main, master] - paths: - - 'src-x86-x64-Fusix/**' push: tags: - 'v*' diff --git a/.github/workflows/build-csharp.yml b/.github/workflows/build-csharp.yml index 468eae5..1d0d5e4 100644 --- a/.github/workflows/build-csharp.yml +++ b/.github/workflows/build-csharp.yml @@ -9,8 +9,6 @@ name: Build C# Tools on: pull_request: branches: [main, master] - paths: - - 'src-csharp/**' push: tags: - 'v*' diff --git a/.github/workflows/build-msi-check.yml b/.github/workflows/build-msi-check.yml index cb7e01a..1fd943a 100644 --- a/.github/workflows/build-msi-check.yml +++ b/.github/workflows/build-msi-check.yml @@ -7,9 +7,6 @@ name: Build MSI Check on: pull_request: branches: [main, master] - paths: - - 'msi/**' - - '.github/workflows/build-msi-check.yml' workflow_dispatch: env: diff --git a/.github/workflows/build-offsetfinder.yml b/.github/workflows/build-offsetfinder.yml index 858ef16..7328070 100644 --- a/.github/workflows/build-offsetfinder.yml +++ b/.github/workflows/build-offsetfinder.yml @@ -7,8 +7,6 @@ on: pull_request: branches: [main, master] - paths: - - 'src-csharp/RDPOffsetFinder/**' push: tags: - 'v*' @@ -55,11 +53,13 @@ jobs: /p:PlatformToolset=v143 ` /v:minimal - # Build the offset finder (links against the Zydis import lib just produced) + # Build via .sln so $(SolutionDir) resolves to the submodule root where + # AdditionalIncludeDirectories and AdditionalDependencies reference zydis/ - name: Build RDPWrapOffsetFinder (${{ matrix.platform }}) working-directory: src-csharp/RDPOffsetFinder run: | - msbuild RDPWrapOffsetFinder\RDPWrapOffsetFinder.vcxproj ` + msbuild RDPWrapOffsetFinder.sln ` + /t:RDPWrapOffsetFinder ` /p:Configuration=Release ` /p:Platform="${{ matrix.platform }}" ` /p:PlatformToolset=v143 ` @@ -70,7 +70,8 @@ jobs: run: | $arch = if ("${{ matrix.platform }}" -eq "Win32") { "x86" } else { "x64" } $root = "src-csharp/RDPOffsetFinder" - $exe = "$root/RDPWrapOffsetFinder/${{ matrix.finder_plat }}/Release/RDPWrapOffsetFinder.exe" + # .sln build outputs to SolutionDir//Release/ (not //Release/) + $exe = "$root/${{ matrix.finder_plat }}/Release/RDPWrapOffsetFinder.exe" $dll = "$root/zydis/msvc/bin/${{ matrix.zydis_bin }}/Zydis.dll" Write-Host "Exe: $(Get-Item $exe | Select-Object -Exp Length) bytes"