Update props and config file for new RIDs

Author: bording

UpdateLibgit2ToSha.ps1

@@ -132,8 +132,12 @@ Push-Location $libgit2Directory
       <TargetPath>lib\osx\lib$binaryFilename.dylib</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\lib$binaryFilename.so">
-      <TargetPath>lib\linux\x86_64\lib$binaryFilename.so</TargetPath>
+    <ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\lib$binaryFilename.so">
+      <TargetPath>lib\ubuntu-x64\lib$binaryFilename.so</TargetPath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ContentWithTargetPath>
+    <ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\lib$binaryFilename.so">
+      <TargetPath>lib\centos-x64\lib$binaryFilename.so</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
     <ContentWithTargetPath Include="`$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
@@ -148,7 +152,7 @@ Push-Location $libgit2Directory
 
     $dllConfig = @"
 <configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/linux/x86_64/lib$binaryFilename.so" />
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/ubuntu-x64/lib$binaryFilename.so" />
     <dllmap os="osx" cpu="x86,x86-64" dll="$binaryFilename" target="lib/osx/lib$binaryFilename.dylib" />
 </configuration>
 "@

nuget.package/build/net461/LibGit2Sharp.NativeBinaries.props

@@ -26,8 +26,12 @@
       <TargetPath>lib\osx\libgit2-6311e88.dylib</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-6311e88.so">
-      <TargetPath>lib\linux\x86_64\libgit2-6311e88.so</TargetPath>
+    <ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\libgit2-6311e88.so">
+      <TargetPath>lib\ubuntu-x64\libgit2-6311e88.so</TargetPath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ContentWithTargetPath>
+    <ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\libgit2-6311e88.so">
+      <TargetPath>lib\centos-x64\libgit2-6311e88.so</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
     <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">

nuget.package/libgit2/LibGit2Sharp.dll.config

@@ -1,4 +1,4 @@
 <configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-6311e88" target="lib/linux/x86_64/libgit2-6311e88.so" />
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-6311e88" target="lib/ubuntu-x64/libgit2-6311e88.so" />
     <dllmap os="osx" cpu="x86,x86-64" dll="git2-6311e88" target="lib/osx/libgit2-6311e88.dylib" />
 </configuration>