Share custom DLL name with [Unsafe]NativeMethods

libgit2 · ben · May 12, 2013 · May 12, 2013 · May 12, 2013 · May 13, 2013
commit ce98f390586507a05a63971f7e6f1111c0f57ffe
diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs
@@ -1,9 +1,7 @@
-
-namespace LibGit2Sharp.Core
+namespace LibGit2Sharp.Core
 {
-	internal static partial class NativeMethods
+	internal static class NativeDllName
 	{
-		private const string libgit2 = "git2_b641c00";
+        public const string Name = "git2.b641c00.dll";
 	}
 }
-
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -11,9 +11,10 @@
 // ReSharper disable InconsistentNaming
 namespace LibGit2Sharp.Core
 {
-    internal static partial class NativeMethods
+    internal static class NativeMethods
     {
         public const uint GIT_PATH_MAX = 4096;
+        private const string libgit2 = NativeDllName.Name;
         private static readonly LibraryLifetimeObject lifetimeObject;
         private static int handlesCount;
 

diff --git a/LibGit2Sharp/Core/UnSafeNativeMethods.cs b/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);

diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1
@@ -151,9 +151,9 @@ Push-Location $libgit2Directory
 	$dllNameClass = @"
 namespace LibGit2Sharp.Core
 {
-	internal static partial class NativeMethods
+	internal static class NativeDllName
 	{
-		private const string libgit2 = "git2.$shortsha";
+		public const string Name = "git2.$shortsha.dll";
 	}
 }
 "@