fix some more linking

Author: ganeshnj

windows/libdatadog.csproj

@@ -38,6 +38,20 @@
     <None Include="$(LibDatadogBinariesOutputDir)\data-pipeline.h" Pack="true"
       PackagePath="include\native\datadog\data-pipeline.h" />
 
+      <!--
+      Follow https://learn.microsoft.com/en-us/nuget/create-packages/native-files-in-net-packages
+
+      Contoso.Native.1.0.0.nuspec
+      ref/net8.0/Contoso.Native.dll
+      runtimes/any/lib/net8.0/Contoso.Native.dll
+      runtimes/linux-arm64/native/libcontoso.so
+      runtimes/linux-x64/native/libcontoso.so
+      runtimes/osx-arm64/native/libcontoso.dylib
+      runtimes/osx-x64/native/libcontoso.dylib
+      runtimes/win-arm64/native/contoso.dll
+      runtimes/win-x64/native/contoso.dll
+      -->
+
     <!-- win-x64 debug -->
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\debug\datadog_profiling_ffi.lib"
       Pack="true" PackagePath="runtimes\win-x64\native\debug\datadog_profiling_ffi.lib" />

windows/libdatadog.props

@@ -1,21 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-        ToolsVersion="15.0">
-  <PropertyGroup>
-    <LIBDATADOG-PLATFORM Condition="'$(Platform)'=='x64'">x64</LIBDATADOG-PLATFORM>
-    <LIBDATADOG-PLATFORM Condition="'$(Platform)'=='Win32' OR '$(Platform)'=='x86'">x86</LIBDATADOG-PLATFORM>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('Linux'))) or $(RuntimeIdentifier.StartsWith('linux'))">
+    <LibdatadogPlatform>linux</LibdatadogPlatform>
+    <LibdatadogLibraryType>so</LibdatadogLibraryType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('Windows'))) or $(RuntimeIdentifier.StartsWith('win'))">
+    <LibdatadogPlatform>win</LibdatadogPlatform>
+    <LibdatadogLibraryType>dll</LibdatadogLibraryType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('OSX'))) or $(RuntimeIdentifier.StartsWith('osx'))">
+    <LibdatadogPlatform>osx</LibdatadogPlatform>
+    <LibdatadogLibraryType>dylib</LibdatadogLibraryType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'x64') or $(RuntimeIdentifier.EndsWith('x64'))">
+    <LibdatadogArchitecture>x64</LibdatadogArchitecture>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm64') or $(RuntimeIdentifier.EndsWith('arm64'))">
+    <LibdatadogArchitecture>arm64</LibdatadogArchitecture>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm') or $(RuntimeIdentifier.EndsWith('arm'))">
+    <LibdatadogArchitecture>arm</LibdatadogArchitecture>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'x86') or $(RuntimeIdentifier.EndsWith('x86'))">
+    <LibdatadogArchitecture>x86</LibdatadogArchitecture>
   </PropertyGroup>
+
   <ItemGroup>
-  <LibdatadogLibs Include="$(MSBuildThisFileDirectory)..\..\build\native\lib\$(LIBDATADOG-PLATFORM)\$(Configuration)\*.lib" />
+    <LibdatadogDynamic Include="$(MSBuildThisFileDirectory)\runtimes\$(LibdatadogPlatform)-$(LibdatadogArchitecture)\native\$(Configuration)\*.$(LibdatadogLibraryType)" />
   </ItemGroup>
+
   <PropertyGroup>
     <!-- Expland the items to a property -->
-    <LibdatadogLibraries>@(LibdatadogLibs)</LibdatadogLibraries>
+    <LibdatadogLibraries>@(LibdatadogDynamic)</LibdatadogLibraries>
     <LibdatadogDependencies>PowrProf.lib;NtDll.lib;UserEnv.lib;Bcrypt.lib;crypt32.lib;wsock32.lib;ws2_32.lib;shlwapi.lib;Secur32.lib;Ncrypt.lib</LibdatadogDependencies>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include\native;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include\native;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(LibdatadogLibraries);$(LibdatadogDependencies);%(AdditionalDependencies)</AdditionalDependencies>