Revert to linux-x64 as default RID

Author: bording

.travis.yml

@@ -8,7 +8,7 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      env: RID=ubuntu-x64
+      env: RID=linux-x64
     - os: linux
       dist: trusty
       sudo: required
@@ -30,7 +30,7 @@ before_install:
 install: true
 
 script:
-  - if [[ $RID == "osx" ]] || [[ $RID == "ubuntu-x64" ]]; then ./build.libgit2.sh ; fi
-  - if [[ $RID != "osx" ]] && [[ $RID != "ubuntu-x64" ]]; then ./dockerbuild.sh   ; fi
+  - if [[ $RID == "osx" ]] || [[ $RID == "linux-x64" ]]; then ./build.libgit2.sh ; fi
+  - if [[ $RID != "osx" ]] && [[ $RID != "linux-x64" ]]; then ./dockerbuild.sh   ; fi
 
 after_success: ./uploadbinaries.sh

UpdateLibgit2ToSha.ps1

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

nuget.package/build/LibGit2Sharp.NativeBinaries.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>

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

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
@@ -26,8 +26,8 @@
       <TargetPath>lib\osx\libgit2-6311e88.dylib</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
-    <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>
+    <ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-6311e88.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-6311e88.so">
+      <TargetPath>lib\linux-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">

nuget.package/libgit2/LibGit2Sharp.dll.config

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