ManualMaster change: we need to deploy and always use win x64 version of git dll

mm-development · mm-development · commit b6295f9d115e · 2018-12-21T11:17:48.000+01:00
diff --git 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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ static NativeMethods()`
`32`	`32`	`string nativeLibraryDir = GlobalSettings.GetAndLockNativeLibraryPath();`
`33`	`33`	`if (nativeLibraryDir != null)`
`34`	`34`	`{`
`35`		`- string nativeLibraryPath = Path.Combine(nativeLibraryDir, libgit2 + Platform.GetNativeLibraryExtension());`
	`35`	`+ string nativeLibraryPath = libgit2 + Platform.GetNativeLibraryExtension();`
`36`	`36`
`37`	`37`	`// Try to load the .dll from the path explicitly.`
`38`	`38`	`// If this call succeeds further DllImports will find the library loaded and not attempt to load it again.`