Include all platform binaries

This change to the props file will make the native binaries for all platforms
be copied into the NativeBinaries folder regardless of which platform you are
building on.

The new LibGit2Sharp.dll.config will ensure that mono can find the linux and
osx binaries when the are in the NativeBinaries folder.

Author: bording

UpdateLibgit2ToSha.ps1

@@ -91,7 +91,7 @@ Push-Location $libgit2Directory
     <ItemGroup>
         <EmbeddedResource Include="`$(MSBuildThisFileDirectory)\..\libgit2\libgit2_hash.txt" />
     </ItemGroup>
-    <ItemGroup Condition=" '`$(OS)' == 'Windows_NT' ">
+    <ItemGroup>
         <None Include="`$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\$binaryFilename.dll">
             <Link>NativeBinaries\amd64\$binaryFilename.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -108,16 +108,16 @@ Push-Location $libgit2Directory
             <Link>NativeBinaries\x86\$binaryFilename.pdb</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup Condition=" '`$(OS)' == 'Unix' And Exists('/Library/Frameworks') ">
         <None Include="`$(MSBuildThisFileDirectory)\..\libgit2\osx\lib$binaryFilename.dylib">
-            <Link>lib$binaryFilename.dylib</Link>
+            <Link>NativeBinaries\osx\lib$binaryFilename.dylib</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-        <ItemGroup Condition=" '`$(OS)' == 'Unix' And !Exists('/Library/Frameworks') ">
         <None Include="`$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\lib$binaryFilename.so">
-            <Link>lib$binaryFilename.so</Link>
+            <Link>NativeBinaries\linux\amd64\lib$binaryFilename.so</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="`$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
+            <Link>LibGit2Sharp.dll.config</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
@@ -126,6 +126,15 @@ Push-Location $libgit2Directory
 
     sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.props") $buildProperties
 
+    $dllConfig = @"
+<configuration>
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="NativeBinaries/linux/amd64/lib$binaryFilename.so" />
+    <dllmap os="osx" cpu="x86,x86-64" dll="$binaryFilename" target="NativeBinaries/osx/lib$binaryFilename.dylib" />
+</configuration>
+"@
+
+    sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\libgit2\LibGit2Sharp.dll.config") $dllConfig
+
     Write-Output "Done!"
 }
 exit

nuget.package/build/LibGit2Sharp.NativeBinaries.props

@@ -3,7 +3,7 @@
     <ItemGroup>
         <EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_hash.txt" />
     </ItemGroup>
-    <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <ItemGroup>
         <None Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-a56db99.dll">
             <Link>NativeBinaries\amd64\git2-a56db99.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -20,16 +20,16 @@
             <Link>NativeBinaries\x86\git2-a56db99.pdb</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-    <ItemGroup Condition=" '$(OS)' == 'Unix' And Exists('/Library/Frameworks') ">
         <None Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-a56db99.dylib">
-            <Link>libgit2-a56db99.dylib</Link>
+            <Link>NativeBinaries\osx\libgit2-a56db99.dylib</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-    </ItemGroup>
-        <ItemGroup Condition=" '$(OS)' == 'Unix' And !Exists('/Library/Frameworks') ">
         <None Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-a56db99.so">
-            <Link>libgit2-a56db99.so</Link>
+            <Link>NativeBinaries\linux\amd64\libgit2-a56db99.so</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
+            <Link>LibGit2Sharp.dll.config</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>

nuget.package/libgit2/LibGit2Sharp.dll.config

@@ -0,0 +1,4 @@
+<configuration>
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-a56db99" target="NativeBinaries/linux/amd64/libgit2-a56db99.so" />
+    <dllmap os="osx" cpu="x86,x86-64" dll="git2-a56db99" target="NativeBinaries/osx/libgit2-a56db99.dylib" />
+</configuration>