From 33c9da7cfe85473470c7bb1be35cdfe21f808dd8 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sat, 14 Dec 2024 17:45:17 -0500
Subject: [PATCH] Attempt to fix packing of native DLLs

---
 BinaryObjectScanner/BinaryObjectScanner.csproj      |  11 ++++-------
 .../{ => runtimes/win-x86}/CascLib.dll              | Bin
 .../{ => runtimes/win-x86}/StormLib.dll             | Bin
 .../{ => runtimes/win-x86}/mspack.dll               | Bin
 4 files changed, 4 insertions(+), 7 deletions(-)
 rename BinaryObjectScanner/{ => runtimes/win-x86}/CascLib.dll (100%)
 rename BinaryObjectScanner/{ => runtimes/win-x86}/StormLib.dll (100%)
 rename BinaryObjectScanner/{ => runtimes/win-x86}/mspack.dll (100%)

diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index d62d5f58..9fea56db 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -54,16 +54,13 @@
     </PropertyGroup>
 
     <!-- These are needed for dealing with native Windows DLLs -->
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND $(RuntimeIdentifier.StartsWith(`win-x86`))">
-        <Content Include="*.dll">
-            <Pack>true</Pack>
-            <PackagePath>contentFiles;content</PackagePath>
-            <IncludeInPackage>true</IncludeInPackage>
-            <CopyToOutput>true</CopyToOutput>
+    <ItemGroup>
+        <Content Include="runtimes\**\*">
             <BuildAction>Content</BuildAction>
-            <copyToOutput>true</copyToOutput>
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+            <PackagePath>%(Identity)</PackagePath>
+            <Pack>true</Pack>
         </Content>
     </ItemGroup>
 
diff --git a/BinaryObjectScanner/CascLib.dll b/BinaryObjectScanner/runtimes/win-x86/CascLib.dll
similarity index 100%
rename from BinaryObjectScanner/CascLib.dll
rename to BinaryObjectScanner/runtimes/win-x86/CascLib.dll
diff --git a/BinaryObjectScanner/StormLib.dll b/BinaryObjectScanner/runtimes/win-x86/StormLib.dll
similarity index 100%
rename from BinaryObjectScanner/StormLib.dll
rename to BinaryObjectScanner/runtimes/win-x86/StormLib.dll
diff --git a/BinaryObjectScanner/mspack.dll b/BinaryObjectScanner/runtimes/win-x86/mspack.dll
similarity index 100%
rename from BinaryObjectScanner/mspack.dll
rename to BinaryObjectScanner/runtimes/win-x86/mspack.dll