Libgit2 dll naming

.gitignore

@@ -34,4 +34,7 @@ _ReSharper*/
 *.pidb
 *.userprefs
 *.swp
-*.DotSettings
+*.DotSettings
+
+!Lib/NativeBinaries/x86/*.pdb
+!Lib/NativeBinaries/amd64/*.pdb

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libgit2"]
 	path = libgit2
-	url = https://github.com/libgit2/libgit2.git
+	url = https://github.com/carlosmn/libgit2.git

.travis.yml

@@ -11,8 +11,10 @@ install:
 script:
  - git submodule update --init
  - mkdir cmake-build
+ - LIBGIT2SHA=`cat ./LibGit2Sharp/libgit2_hash.txt`
+ - SHORTSHA=${LIBGIT2SHA:0:7}
  - cd cmake-build
- - cmake -DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=./libgit2-bin ../libgit2
+ - cmake -DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=./libgit2-bin -DSONAME_APPEND=$SHORTSHA ../libgit2
  - export LD_LIBRARY_PATH=$PWD/libgit2-bin/lib
  - cmake --build . --target install
  - cd ..

Lib/Libgit2sharp.dll.config

@@ -0,0 +1,5 @@
+<configuration>
+  <dllmap os="!windows,osx" dll="git2.3bbc87d" target="git2.so"/>
+  <dllmap os="osx" dll="git2.3bbc87d" target="git2.dylib"/>
+  <dllmap os="windows" dll="git2.3bbc87d" target="git2.3bbc87d.dll"/>
+</configuration>

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -136,4 +136,4 @@
     </CreateItem>
     <Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(OutputPath)NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
-</Project>
+</Project>

LibGit2Sharp/Core/NativeDllName.cs

@@ -0,0 +1,7 @@
+namespace LibGit2Sharp.Core
+{
+	internal static class NativeDllName
+	{
+		public const string Name = "git2-3bbc87d";
+	}
+}

LibGit2Sharp/Core/NativeMethods.cs

@@ -14,7 +14,7 @@ namespace LibGit2Sharp.Core
     internal static class NativeMethods
     {
         public const uint GIT_PATH_MAX = 4096;
-        private const string libgit2 = "git2";
+        private const string libgit2 = NativeDllName.Name;
         private static readonly LibraryLifetimeObject lifetimeObject;
         private static int handlesCount;
 

LibGit2Sharp/Core/UnSafeNativeMethods.cs

@@ -6,7 +6,7 @@ namespace LibGit2Sharp.Core
 {
     internal static unsafe class UnSafeNativeMethods
     {
-        private const string libgit2 = "git2";
+        private const string libgit2 = NativeDllName.Name;
 
         [DllImport(libgit2)]
         internal static extern int git_reference_list(out git_strarray array, RepositorySafeHandle repo, GitReferenceType flags);

LibGit2Sharp/LibGit2Sharp.csproj

@@ -67,6 +67,7 @@
     <Compile Include="Changes.cs" />
     <Compile Include="CheckoutCallbacks.cs" />
     <Compile Include="CheckoutOptions.cs" />
+    <Compile Include="Core\NativeDllName.cs" />
     <Compile Include="ObjectType.cs" />
     <Compile Include="ReferenceExtensions.cs" />
     <Compile Include="Conflict.cs" />
@@ -271,4 +272,4 @@
     </CreateItem>
     <Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(OutputPath)NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
-</Project>
+</Project>

LibGit2Sharp/libgit2_hash.txt

@@ -1 +1 @@
-b641c00eebb3c60e8719c0dfc55dde91ca30a5d2
+3bbc87d697b24725beb8dcd41fa83ca604d3a9e2

UpdateLibgit2ToSha.ps1

@@ -18,6 +18,7 @@ Param(
 	[switch]$debug
 )
 
+
 Set-StrictMode -Version Latest
 
 $self = Split-Path -Leaf $MyInvocation.MyCommand.Path
@@ -111,6 +112,7 @@ Push-Location $libgit2Directory
 		popd
 		break
 	}
+	$shortsha = $sha.Substring(0,7)
 
 	Write-Output "Checking out $sha..."
 	Run-Command -Quiet -Fatal { & $git checkout $sha }
@@ -119,26 +121,49 @@ Push-Location $libgit2Directory
 	Run-Command -Quiet { & remove-item build -recurse -force }
 	Run-Command -Quiet { & mkdir build }
 	cd build
-	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D THREADSAFE=ON -D "BUILD_CLAR=$build_clar" .. }
+	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D THREADSAFE=ON -D "BUILD_CLAR=$build_clar" -D "SONAME_APPEND=$shortsha" .. }
 	Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration }
 	if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
 	cd $configuration
 	Run-Command -Quiet { & rm *.exp }
+	Run-Command -Quiet { & rm $x86Directory\* }
 	Run-Command -Quiet -Fatal { & copy -fo * $x86Directory }
 
 	Write-Output "Building 64-bit..."
 	cd ..
 	Run-Command -Quiet { & mkdir build64 }
 	cd build64
-	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D "BUILD_CLAR=$build_clar" ../.. }
+	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D "BUILD_CLAR=$build_clar" -D "SONAME_APPEND=$shortsha" ../.. }
 	Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration }
 	if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
 	cd $configuration
 	Run-Command -Quiet { & rm *.exp }
+	Run-Command -Quiet { & rm $x64Directory\* }
 	Run-Command -Quiet -Fatal { & copy -fo * $x64Directory }
 
-	Write-Output "Done!"
 	pop-location
-	sc -Encoding UTF8 libgit2sharp\libgit2_hash.txt $sha
+
+	$dllMap = @"
+<configuration>
+  <dllmap os="!windows,osx" dll="git2.$shortsha" target="git2.so"/>
+  <dllmap os="osx" dll="git2.$shortsha" target="git2.dylib"/>
+  <dllmap os="windows" dll="git2.$shortsha" target="git2.$shortsha.dll"/>
+</configuration>
+"@
+	$dllNameClass = @"
+namespace LibGit2Sharp.Core
+{
+	internal static class NativeDllName
+	{
+		public const string Name = "git2-$shortsha";
+	}
+}
+"@
+
+	sc -Encoding ASCII .\Libgit2sharp\Core\NativeDllName.cs $dllNameClass
+	sc -Encoding ASCII .\Lib\Libgit2sharp.dll.config $dllMap
+	sc -Encoding ASCII libgit2sharp\libgit2_hash.txt $sha
+
+	Write-Output "Done!"
 }
 exit

build.libgit2sharp.sh

@@ -2,10 +2,14 @@
 
 PREVIOUS_LD=$LD_LIBRARY_PATH
 
+LIBGIT2SHA=`cat ./LibGit2Sharp/libgit2_hash.txt`
+SHORTSHA=${LIBGIT2SHA:0:7}
+echo $SHORTSHA
+
 rm -rf cmake-build
 mkdir cmake-build && cd cmake-build
 
-cmake -DBUILD_SHARED_LIBS:BOOL=ON -DTHREADSAFE:BOOL=ON -DBUILD_CLAR:BOOL=OFF -DCMAKE_INSTALL_PREFIX=./libgit2-bin ../libgit2
+cmake -DBUILD_SHARED_LIBS:BOOL=ON -DTHREADSAFE:BOOL=ON -DBUILD_CLAR:BOOL=OFF -DCMAKE_INSTALL_PREFIX=./libgit2-bin -DSONAME_APPEND=$SHORTSHA ../libgit2
 cmake --build . --target install
 
 LD_LIBRARY_PATH=$PWD/libgit2-bin/lib:$LD_LIBRARY_PATH