include osx dylib in nuget

DataDog · Nov 6, 2024 · 86a26ce · 86a26ce
1 parent 1390ef6
commit 86a26ce
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -67,13 +67,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download Windows artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: windows-bin
           path: bin
 
       - name: Download mac artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: macos-bin
           path: bin

diff --git a/windows/build/build.sh b/windows/build/build.sh
diff --git a/windows/libdatadog.csproj b/windows/libdatadog.csproj
@@ -38,32 +38,48 @@
     <None Include="$(LibDatadogBinariesOutputDir)\data-pipeline.h" Pack="true"
       PackagePath="include\native\datadog\data-pipeline.h" />
 
+    <!-- win-x64 debug -->
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\debug\datadog_profiling_ffi.lib"
-      Pack="true" PackagePath="build\native\lib\x64\debug\datadog_profiling_ffi.lib" />
+      Pack="true" PackagePath="runtimes\win-x64\native\debug\datadog_profiling_ffi.lib" />
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\debug\datadog_profiling_ffi.dll"
-      Pack="true" PackagePath="build\native\lib\x64\debug\datadog_profiling_ffi.dll" />
+      Pack="true" PackagePath="runtimes\win-x64\native\debug\datadog_profiling_ffi.dll" />
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\debug\datadog_profiling_ffi.pdb"
-      Pack="true" PackagePath="build\native\lib\x64\debug\datadog_profiling_ffi.pdb" />
+      Pack="true" PackagePath="runtimes\win-x64\native\debug\datadog_profiling_ffi.pdb" />
 
+    <!-- win-x64 release -->
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\release\datadog_profiling_ffi.lib"
-      Pack="true" PackagePath="build\native\lib\x64\release\datadog_profiling_ffi.lib" />
+      Pack="true" PackagePath="runtimes\win-x64\native\release\datadog_profiling_ffi.lib" />
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\release\datadog_profiling_ffi.dll"
-      Pack="true" PackagePath="build\native\lib\x64\release\datadog_profiling_ffi.dll" />
+      Pack="true" PackagePath="runtimes\win-x64\native\release\datadog_profiling_ffi.dll" />
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\release\datadog_profiling_ffi.pdb"
-      Pack="true" PackagePath="build\native\lib\x64\release\datadog_profiling_ffi.lpdb" />
+      Pack="true" PackagePath="runtimes\win-x64\native\release\datadog_profiling_ffi.pdb" />
 
+    <!-- win-x86 debug -->
     <None Include="$(LibDatadogBinariesOutputDir)\i686-pc-windows-msvc\debug\datadog_profiling_ffi.lib"
-      Pack="true" PackagePath="build\native\lib\x86\debug\datadog_profiling_ffi.lib" />
+      Pack="true" PackagePath="runtimes\win-x86\native\debug\datadog_profiling_ffi.lib" />
     <None Include="$(LibDatadogBinariesOutputDir)\i686-pc-windows-msvc\debug\datadog_profiling_ffi.dll"
-      Pack="true" PackagePath="build\native\lib\x86\debug\datadog_profiling_ffi.dll" />
+      Pack="true" PackagePath="runtimes\win-x86\native\debug\datadog_profiling_ffi.dll" />
     <None Include="$(LibDatadogBinariesOutputDir)\i686-pc-windows-msvc\debug\datadog_profiling_ffi.pdb"
-      Pack="true" PackagePath="build\native\lib\x86\debug\datadog_profiling_ffi.pdb" />
+      Pack="true" PackagePath="runtimes\win-x86\native\debug\datadog_profiling_ffi.pdb" />
 
+    <!-- win-x86 release -->
     <None Include="$(LibDatadogBinariesOutputDir)\i686-pc-windows-msvc\release\datadog_profiling_ffi.lib"
-      Pack="true" PackagePath="build\native\lib\x86\release\datadog_profiling_ffi.lib" />
+      Pack="true" PackagePath="runtimes\win-x86\native\release\datadog_profiling_ffi.lib" />
     <None Include="$(LibDatadogBinariesOutputDir)\i686-pc-windows-msvc\release\datadog_profiling_ffi.dll"
-      Pack="true" PackagePath="build\native\lib\x86\release\datadog_profiling_ffi.dll" />
+      Pack="true" PackagePath="runtimes\win-x86\native\release\datadog_profiling_ffi.dll" />
     <None Include="$(LibDatadogBinariesOutputDir)\i686-pc-windows-msvc\release\datadog_profiling_ffi.pdb"
-      Pack="true" PackagePath="build\native\lib\x86\release\datadog_profiling_ffi.pdb" />
+      Pack="true" PackagePath="runtimes\win-x86\native\release\datadog_profiling_ffi.pdb" />
+
+    <!-- osx-x64 -->
+    <None Include="$(LibDatadogBinariesOutputDir)/x86_64-apple-darwin/debug/libdatadog_profiling_ffi.dylib"
+      Pack="true" PackagePath="runtimes/osx-x64/native/lib/debug/libdatadog_profiling_ffi.dylib" />
+    <None Include="$(LibDatadogBinariesOutputDir)/x86_64-apple-darwin/release/libdatadog_profiling_ffi.a"
+      Pack="true" PackagePath="runtimes/osx-x64/native/lib/release/libdatadog_profiling_ffi.a" />
+
+    <!-- osx-arm64 -->
+    <None Include="$(LibDatadogBinariesOutputDir)/aarch64-apple-darwin/debug/libdatadog_profiling_ffi.dylib"
+      Pack="true" PackagePath="runtimes/osx-arm64/native/lib/debug/libdatadog_profiling_ffi.dylib" />
+    <None Include="$(LibDatadogBinariesOutputDir)/aarch64-apple-darwin/release/libdatadog_profiling_ffi.a"
+      Pack="true" PackagePath="runtimes/osx-arm64/native/lib/release/libdatadog_profiling_ffi.a" />
   </ItemGroup>
 </Project>