Fix native library copying from NuGet package (v0.4.4) (#57)

* fix: Package native library in runtimes/{rid}/native/ for NuGet auto-copy (v0.4.4)

Fixes d2wrapper native library not being copied to consuming projects.

Changes:
- Modified IncludeNativeLibrary target in D2Sharp.csproj to copy built native library to runtimes/{rid}/native/ during local builds
- Added CopyD2SharpNativeLibrary target to D2Sharp.targets to copy native library from package to consuming project's bin/
- Targets file uses relative paths (../runtimes/{rid}/native/) to locate library in NuGet package cache
- Package now includes native library in both lib/net8.0/ (backwards compat) and runtimes/{rid}/native/ (auto-copy)
- Updated CHANGELOG.md with v0.4.4 release notes
- Bumped version to 0.4.4 in D2Sharp.csproj
- Updated NuGetExample to reference D2Sharp v0.4.4
- Verified rendering works: all 5 examples run successfully

Resolves issue where v0.4.3 copied Worker files but not the native library.

* chore: Ignore generated SVG files in NuGetExample

* fix: Make native library copy conditional to prevent CI build failures

The Copy task in IncludeNativeLibrary target now checks if the source file exists before attempting to copy. This prevents MSB3030 errors in CI builds where the native library may not be built yet.

The CI workflow already handles native library placement by downloading artifacts from all platforms and manually copying them to runtimes/{rid}/native/, so this local copy is optional for CI builds.

Author: AlrikOlson

.gitignore

@@ -102,3 +102,5 @@ d2wrapper.h
 appsettings.*.json
 
 tools/D2Sharp.DiagramCLI/output
+# Generated D2 diagram outputs
+examples/D2Sharp.NuGetExample/*.svg

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.4] - 2025-10-21
+
+### Fixed
+- **NuGet packaging**: Fixed d2wrapper native library not being copied to consuming projects (v0.4.3 regression)
+  - Modified `IncludeNativeLibrary` target in D2Sharp.csproj to copy built native library to `runtimes/{rid}/native/` directory during local builds
+  - Added `CopyD2SharpNativeLibrary` target to D2Sharp.targets to automatically copy native library from package to consuming project's bin/
+  - Targets file uses relative paths (`../runtimes/{rid}/native/`) to locate native library in NuGet package cache
+  - Automatically detects platform (Windows/Linux/macOS) and handles correct file extension (.dll/.so/.dylib)
+  - Fallback to project reference path (`../d2wrapper/`) for local development with project references
+  - Package now includes native library in both `lib/net8.0/` (backwards compat) and `runtimes/{rid}/native/` (automatic copy)
+  - Verified all examples run successfully and rendering works correctly
+  - Users of v0.4.1, v0.4.2, or v0.4.3 should upgrade to v0.4.4 for working rendering
+
 ## [0.4.3] - 2025-10-21
 
 ### Fixed
@@ -15,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Rewrote D2Sharp.targets to use Copy task instead of Content items for reliable file copying
   - Fixed MSBuild ".." path error during NuGet restore by moving path resolution into build target
   - Verified all 13 Worker files now copy correctly from NuGet package
-  - Users of v0.4.1 or v0.4.2 should upgrade to v0.4.3 for working process isolation
+  - NOTE: v0.4.3 package is broken - Worker files copy but native library doesn't. Use v0.4.4 instead
 
 ## [0.4.2] - 2025-10-21
 
@@ -388,7 +401,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Go wrapper for D2 library
 - .NET 8.0 library
 
-[Unreleased]: https://github.com/AlrikOlson/D2Sharp/compare/v0.4.3...HEAD
+[Unreleased]: https://github.com/AlrikOlson/D2Sharp/compare/v0.4.4...HEAD
+[0.4.4]: https://github.com/AlrikOlson/D2Sharp/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/AlrikOlson/D2Sharp/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/AlrikOlson/D2Sharp/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/AlrikOlson/D2Sharp/compare/v0.4.0...v0.4.1

examples/D2Sharp.NuGetExample/D2Sharp.NuGetExample.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="D2Sharp" Version="0.4.3" />
+        <PackageReference Include="D2Sharp" Version="0.4.4" />
     </ItemGroup>
 
 </Project>

src/D2Sharp/D2Sharp.csproj

@@ -15,10 +15,10 @@
         <InternalsVisibleTo>D2Sharp.Benchmarks</InternalsVisibleTo>
 
         <!-- Version information -->
-        <VersionPrefix>0.4.3</VersionPrefix>
+        <VersionPrefix>0.4.4</VersionPrefix>
         <VersionSuffix></VersionSuffix>
-        <AssemblyVersion>0.4.3.0</AssemblyVersion>
-        <FileVersion>0.4.3.0</FileVersion>
+        <AssemblyVersion>0.4.4.0</AssemblyVersion>
+        <FileVersion>0.4.4.0</FileVersion>
         <InformationalVersion>$(VersionPrefix)</InformationalVersion>
 
         <!-- Package metadata -->
@@ -77,7 +77,22 @@
 
     <!-- Include native library dynamically after it's built -->
     <Target Name="IncludeNativeLibrary" AfterTargets="BuildD2Wrapper" BeforeTargets="BeforeBuild">
+        <PropertyGroup>
+            <!-- Determine RID based on OS -->
+            <_NativeLibRID Condition="$([MSBuild]::IsOSPlatform('Windows'))">win-x64</_NativeLibRID>
+            <_NativeLibRID Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_NativeLibRID>
+            <_NativeLibRID Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</_NativeLibRID>
+        </PropertyGroup>
+
+        <!-- Copy native library to runtimes/{rid}/native/ for NuGet packaging -->
+        <MakeDir Directories="$(MSBuildProjectDirectory)/runtimes/$(_NativeLibRID)/native" />
+        <Copy SourceFiles="$(OutputPath)$(NativeLibName)"
+              DestinationFolder="$(MSBuildProjectDirectory)/runtimes/$(_NativeLibRID)/native/"
+              SkipUnchangedFiles="true"
+              Condition="Exists('$(OutputPath)$(NativeLibName)')" />
+
         <ItemGroup>
+            <!-- Package in lib/net8.0 for backwards compatibility and direct use -->
             <Content Include="$(OutputPath)$(NativeLibName)">
                 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                 <Pack>true</Pack>

src/D2Sharp/D2Sharp.targets

@@ -35,4 +35,41 @@
     <!-- Warn if Worker files were not found -->
     <Warning Condition="'$(_D2SharpWorkerSourcePath)' == ''" Text="D2Sharp.Worker executable not found. Process isolation will not be available. Run 'dotnet build' at solution level or ensure Worker project is built." />
   </Target>
+
+  <!-- Copy d2wrapper native library to consuming project's output directory -->
+  <Target Name="CopyD2SharpNativeLibrary" AfterTargets="Build">
+    <PropertyGroup>
+      <!-- Determine native library extension based on OS -->
+      <_D2WrapperExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.dll</_D2WrapperExtension>
+      <_D2WrapperExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.dylib</_D2WrapperExtension>
+      <_D2WrapperExtension Condition="$([MSBuild]::IsOSPlatform('Linux'))">.so</_D2WrapperExtension>
+      <_D2WrapperLibName>d2wrapper$(_D2WrapperExtension)</_D2WrapperLibName>
+
+      <!-- For NuGet package: try lib/net8.0 first (where D2Sharp packages it) -->
+      <_D2WrapperNuGetLibPath>$(MSBuildThisFileDirectory)..\lib\net8.0\$(_D2WrapperLibName)</_D2WrapperNuGetLibPath>
+
+      <!-- Fallback: check runtimes/{rid}/native/ in case of multi-platform packaging -->
+      <_D2WrapperRID Condition="$([MSBuild]::IsOSPlatform('Windows'))">win-x64</_D2WrapperRID>
+      <_D2WrapperRID Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_D2WrapperRID>
+      <_D2WrapperRID Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</_D2WrapperRID>
+      <_D2WrapperNuGetRuntimePath>$(MSBuildThisFileDirectory)..\runtimes\$(_D2WrapperRID)\native\$(_D2WrapperLibName)</_D2WrapperNuGetRuntimePath>
+
+      <!-- For project references: native library is in ../d2wrapper/ -->
+      <_D2WrapperProjectPath>$(MSBuildThisFileDirectory)..\d2wrapper\$(_D2WrapperLibName)</_D2WrapperProjectPath>
+
+      <!-- Choose the path that exists (try lib/net8.0 first, then runtimes, then project) -->
+      <_D2WrapperSourcePath Condition="Exists('$(_D2WrapperNuGetLibPath)')">$(_D2WrapperNuGetLibPath)</_D2WrapperSourcePath>
+      <_D2WrapperSourcePath Condition="'$(_D2WrapperSourcePath)' == '' AND Exists('$(_D2WrapperNuGetRuntimePath)')">$(_D2WrapperNuGetRuntimePath)</_D2WrapperSourcePath>
+      <_D2WrapperSourcePath Condition="'$(_D2WrapperSourcePath)' == '' AND Exists('$(_D2WrapperProjectPath)')">$(_D2WrapperProjectPath)</_D2WrapperSourcePath>
+    </PropertyGroup>
+
+    <!-- Copy native library if found -->
+    <Copy Condition="'$(_D2WrapperSourcePath)' != ''"
+          SourceFiles="$(_D2WrapperSourcePath)"
+          DestinationFolder="$(OutputPath)"
+          SkipUnchangedFiles="true" />
+
+    <!-- Warn if native library was not found -->
+    <Warning Condition="'$(_D2WrapperSourcePath)' == ''" Text="d2wrapper native library not found. D2Sharp rendering will not work. Ensure the native library is built and packaged correctly." />
+  </Target>
 </Project>