Merge pull request #539 from dotnet/libgit2Update

Update libgit2sharp to 0.27.0-preview-0096

Author: AArnott

src/Directory.Build.props

@@ -21,7 +21,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- LibGit2Sharp Native Binary version - used in both main project and Cake addin -->
-    <LibGit2SharpNativeVersion>2.0.306</LibGit2SharpNativeVersion>
+    <LibGit2SharpNativeVersion>2.0.312</LibGit2SharpNativeVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0-5.final" PrivateAssets="all" />

src/NerdBank.GitVersioning.Tests/LibGit2Loader.cs

@@ -16,10 +16,6 @@ public abstract partial class RepoTestBase : IDisposable
 
     public RepoTestBase(ITestOutputHelper logger)
     {
-#if NETCOREAPP
-        LibGit2Loader.EnsureRegistered();
-#endif
-
         Requires.NotNull(logger, nameof(logger));
 
         this.Logger = logger;

src/NerdBank.GitVersioning.Tests/RepoTestBase.cs

@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" PrivateAssets="none" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0096" PrivateAssets="none" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />

src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj

@@ -24,69 +24,6 @@ protected override Assembly Load(AssemblyName assemblyName)
                 ? this.LoadFromAssemblyPath(path)
                 : Default.LoadFromAssemblyName(assemblyName);
         }
-
-        protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
-        {
-            var modulePtr = IntPtr.Zero;
-
-            if (unmanagedDllName.StartsWith("git2-", StringComparison.Ordinal) ||
-                unmanagedDllName.StartsWith("libgit2-", StringComparison.Ordinal))
-            {
-                var directory = GetNativeLibraryDirectory();
-                var extension = GetNativeLibraryExtension();
-
-                if (!unmanagedDllName.EndsWith(extension, StringComparison.Ordinal))
-                {
-                    unmanagedDllName += extension;
-                }
-
-                var nativeLibraryPath = Path.Combine(directory, unmanagedDllName);
-                if (!File.Exists(nativeLibraryPath))
-                {
-                    nativeLibraryPath = Path.Combine(directory, "lib" + unmanagedDllName);
-                }
-
-                modulePtr = this.LoadUnmanagedDllFromPath(nativeLibraryPath);
-            }
-
-            return (modulePtr != IntPtr.Zero) ? modulePtr : base.LoadUnmanagedDll(unmanagedDllName);
-        }
-
-        internal static string GetNativeLibraryDirectory()
-        {
-            var dir = Path.GetDirectoryName(typeof(GitLoaderContext).Assembly.Location);
-
-            // When invoked as a MSBuild task, the native libraries will be at
-            // ../runtimes. When invoked from the nbgv CLI, the libraries
-            // will be at ./runtimes.
-            string runtimePath = RuntimePath;
-            if (!Directory.Exists(Path.Combine(dir, runtimePath)))
-            {
-                runtimePath = "." + runtimePath;
-            }
-
-            return Path.Combine(dir, runtimePath, RuntimeIdMap.GetNativeLibraryDirectoryName(RuntimeEnvironment.GetRuntimeIdentifier()), "native");
-        }
-
-        private static string GetNativeLibraryExtension()
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                return ".dll";
-            }
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                return ".dylib";
-            }
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                return ".so";
-            }
-
-            throw new PlatformNotSupportedException();
-        }
     }
 }
 #endif

src/Nerdbank.GitVersioning.Tasks/GitLoaderContext.cs

@@ -30,12 +30,12 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
     <file src="$LibGit2SharpNativeBinaries$runtimes\**" target="build\runtimes\" />
 
     <!-- Additional copies to work around DllNotFoundException on Mono (https://github.com/dotnet/Nerdbank.GitVersioning/issues/222) -->
-    <file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-106a5f2.dylib" target="build\MSBuildFull\lib\osx\libgit2-106a5f2.dylib" />
-    <file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-106a5f2.so" target="build\MSBuildFull\lib\linux-x64\libgit2-106a5f2.so" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-6777db8.dylib" target="build\MSBuildFull\lib\osx\libgit2-6777db8.dylib" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-6777db8.so" target="build\MSBuildFull\lib\linux-x64\libgit2-6777db8.so" />
 
     <!-- Additional copies to work with our own ps1 scripts (https://github.com/dotnet/Nerdbank.GitVersioning/issues/248) -->
-    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x64\native\git2-106a5f2.dll" target="build\MSBuildFull\lib\win32\x64\git2-106a5f2.dll" />
-    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-106a5f2.dll" target="build\MSBuildFull\lib\win32\x86\git2-106a5f2.dll" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x64\native\git2-6777db8.dll" target="build\MSBuildFull\lib\win32\x64\git2-6777db8.dll" />
+    <file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-6777db8.dll" target="build\MSBuildFull\lib\win32\x86\git2-6777db8.dll" />
 
     <file src="$LibGit2SharpNativeBinaries$libgit2\LibGit2Sharp.dll.config" target="build\MSBuildCore\LibGit2Sharp.dll.config" />
     <file src="$BaseOutputPath$netcoreapp2.1\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />