Switching withdll to use the Microsoft.Win32Metadata nuget package.

lowleveldesign · Jun 20, 2024 · 6f68d8e · 6f68d8e
1 parent b23c8a2
commit 6f68d8e
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 194 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,25 +37,6 @@ jobs:
       run: nmake
       working-directory: detours
 
-    - name: Build the detours DLL
-      working-directory: detours-dll
-      run: |
-        mkdir bin.${{ matrix.arch }}
-        pushd bin.${{ matrix.arch }}
-        cl.exe /nologo /LD /TP /DUNICODE /DWIN32 /D_WINDOWS /EHsc /W4 /WX /Zi /O2 /Ob1 /DNDEBUG /Fodetours.obj /Fddetours.pdb ..\detours.cpp ^
-            /link /def:..\detours.def "%GITHUB_WORKSPACE%\detours\lib.${{ matrix.arch }}\detours.lib"
-        popd
-
-    - name: Apply detours.h patch
-      if: ${{ matrix.arch == 'x64' }}
-      shell: pwsh
-      run: "@(Get-Content \".\\detours\\src\\detours.h\")[0..866+920..1234] | Set-Content \".\\detours\\include\\detours.h\""
-
-    - name: Build detours metadata
-      if: ${{ matrix.arch == 'x64' }}
-      working-directory: detours-meta
-      run: dotnet build /p:BuildConfig=""
-
     - name: Build and publish withdll
       if: ${{ matrix.arch == 'x64' }}
       working-directory: withdll

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "detours"]
-	path = detours
+[submodule "Detours"]
+	path = Detours
 	url = https://github.com/microsoft/Detours.git
+	shallow = true
diff --git a/Detours b/Detours
diff --git a/build-all.bat b/build-all.bat
diff --git a/build-detours.bat b/build-detours.bat
diff --git a/detours b/detours
diff --git a/detours-dll/detours.cpp b/detours-dll/detours.cpp
diff --git a/detours-dll/detours.def b/detours-dll/detours.def
diff --git a/detours-meta/generate.proj b/detours-meta/generate.proj
diff --git a/detours-meta/main.cpp b/detours-meta/main.cpp
diff --git a/withdll/withdll.csproj b/withdll/withdll.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -12,16 +12,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectionMetadataWinmd Include="../detours-meta/winmd/*.winmd" />
-
-        <DirectPInvoke Include="detours" />
-        <NativeLibrary Include="../detours/lib.X64/detours.lib" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.46-beta">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+      <PackageReference Include="Detours.Win32Metadata" Version="4.0.1.8" />
+      <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
     </ItemGroup>
 
 </Project>