Fix some issues relating to packaging of the native module.

* Fix module being missing from NuGet packages. * Include symbol files in Debug builds. * Mark the module as CopyToOutputDirectory=PreserveNewest instead of Always in the packaged target that includes the module in user projects.
vezel-dev · Jan 7, 2024 · eccb221 · eccb221
1 parent c4dc716
commit eccb221
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/src/injection/injection.csproj b/src/injection/injection.csproj
@@ -37,36 +37,26 @@ assemblies into processes.</PackageDescription>
         <PackageReference Include="PeNet" />
     </ItemGroup>
 
-    <Target Name="_AddModule"
-            Returns="@(Content)">
+    <Target Name="_AddNativeLibraries"
+            BeforeTargets="AssignTargetPaths; _GetPackageFiles">
         <MSBuild Projects="../module/module.cproj"
-                 Targets="GetTargetPath">
+                 Targets="_GetNativeLibraries">
             <Output TaskParameter="TargetOutputs"
-                    ItemName="_ModulePath" />
+                    ItemName="_NativeLibrary" />
         </MSBuild>
 
         <ItemGroup>
-            <Content Include="@(_ModulePath)"
-                     CopyToOutputDirectory="Always"
+            <Content Include="@(_NativeLibrary)"
+                     Link="%(Filename)%(Extension)"
+                     CopyToOutputDirectory="PreserveNewest"
+                     PackagePath="ruptura" />
+            <_NativeLibrarySymbols Include="@(_NativeLibrary->'%(Symbols)')" />
+            <Content Include="@(_NativeLibrarySymbols)"
+                     Link="%(Filename)%(Extension)"
+                     CopyToOutputDirectory="PreserveNewest"
                      PackagePath="ruptura" />
         </ItemGroup>
     </Target>
 
-    <Target Name="_AddModules"
-            BeforeTargets="AssignTargetPaths">
-        <ItemGroup>
-            <_RuntimeIdentifiers Include="win-x64" />
-            <_Projects Include="$(MSBuildProjectFullPath)"
-                       Properties="RuntimeIdentifier=%(_RuntimeIdentifiers.Identity)" />
-        </ItemGroup>
-
-        <MSBuild Projects="@(_Projects)"
-                 Targets="_AddModule"
-                 BuildInParallel="$(BuildInParallel)">
-            <Output TaskParameter="TargetOutputs"
-                    ItemName="Content" />
-        </MSBuild>
-    </Target>
-
     <Import Project="../system/system.targets" />
 </Project>
diff --git a/src/injection/injection.targets b/src/injection/injection.targets
@@ -13,8 +13,8 @@
             BeforeTargets="AssignTargetPaths"
             Condition="'$(RupturaIncludeModules)' != 'false'">
         <ItemGroup>
-            <Content Include="$(MSBuildThisFileDirectory)../ruptura/ruptura-*.dll"
-                     CopyToOutputDirectory="Always" />
+            <Content Include="$(MSBuildThisFileDirectory)../ruptura/ruptura-*.dll; $(MSBuildThisFileDirectory)../ruptura/ruptura-*.pdb"
+                     CopyToOutputDirectory="PreserveNewest" />
         </ItemGroup>
     </Target>
 </Project>
diff --git a/src/module/module.cproj b/src/module/module.cproj
@@ -46,4 +46,29 @@
         <PackageReference Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost"
                           GeneratePathProperty="true" />
     </ItemGroup>
+
+    <Target Name="_GetNativeLibrary"
+            Returns="@(_NativeLibrary)">
+        <ItemGroup>
+            <_NativeLibrary Include="$(TargetPath)"
+                            Symbols="@(_DebugSymbolsOutputPath)"
+                            RuntimeIdentifier="$(RuntimeIdentifier)" />
+        </ItemGroup>
+    </Target>
+
+    <Target Name="_GetNativeLibraries"
+            Returns="@(_NativeLibrary)">
+        <ItemGroup>
+            <_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
+            <_Projects Include="$(MSBuildProjectFullPath)"
+                       Properties="RuntimeIdentifier=%(_RuntimeIdentifiers.Identity)" />
+        </ItemGroup>
+
+        <MSBuild Projects="@(_Projects)"
+                 Targets="_GetNativeLibrary"
+                 BuildInParallel="$(BuildInParallel)">
+            <Output TaskParameter="TargetOutputs"
+                    ItemName="_NativeLibrary" />
+        </MSBuild>
+    </Target>
 </Project>