From b6295f9d115e35b4f80ae76b08f776f9649ba18d Mon Sep 17 00:00:00 2001
From: ManualMaster Development <development@manualmaster.com>
Date: Fri, 21 Dec 2018 11:17:48 +0100
Subject: [PATCH 1/2] ManualMaster change: we need to deploy and always use win
 x64 version of git dll

---
 LibGit2Sharp/Core/NativeMethods.cs | 2 +-
 LibGit2Sharp/LibGit2Sharp.csproj   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index fd0594384..efd5cd398 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -32,7 +32,7 @@ static NativeMethods()
                 string nativeLibraryDir = GlobalSettings.GetAndLockNativeLibraryPath();
                 if (nativeLibraryDir != null)
                 {
-                    string nativeLibraryPath = Path.Combine(nativeLibraryDir, libgit2 + Platform.GetNativeLibraryExtension());
+                    string nativeLibraryPath = libgit2 + Platform.GetNativeLibraryExtension();
 
                     // Try to load the .dll from the path explicitly.
                     // If this call succeeds further DllImports will find the library loaded and not attempt to load it again.
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 2acbf29e0..0cb22e9cc 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.258]" PrivateAssets="none" />
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.260" PrivateAssets="none" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="all" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
   </ItemGroup>

From f878bb82559ae22615c8c7c49c5b775845ea6c60 Mon Sep 17 00:00:00 2001
From: ManualMaster Development <development@manualmaster.com>
Date: Wed, 23 Jan 2019 14:36:28 +0100
Subject: [PATCH 2/2] Changes in logic of loading git lib

---
 LibGit2Sharp/Core/NativeMethods.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index efd5cd398..fd0594384 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -32,7 +32,7 @@ static NativeMethods()
                 string nativeLibraryDir = GlobalSettings.GetAndLockNativeLibraryPath();
                 if (nativeLibraryDir != null)
                 {
-                    string nativeLibraryPath = libgit2 + Platform.GetNativeLibraryExtension();
+                    string nativeLibraryPath = Path.Combine(nativeLibraryDir, libgit2 + Platform.GetNativeLibraryExtension());
 
                     // Try to load the .dll from the path explicitly.
                     // If this call succeeds further DllImports will find the library loaded and not attempt to load it again.