NativeMethods: setup shutdown handler only when init succeeds

Only set up the object with the `git_libgit2_shutdown` finalizer when
`git_libgit2_init` has succeeded.  This ensures that setting up the
finalizer is the last thing that we do in the static constructor for
`NativeMethods`, meaning that any exception trying to p/invoke
`git_libgit2_init` remains catch-able.

Author: ethomson

LibGit2Sharp/Core/NativeMethods.cs

@@ -19,26 +19,7 @@ internal static class NativeMethods
         // This will handle initialization and shutdown of the underlying
         // native library.
         #pragma warning disable 0414
-        private static readonly LibraryLifetimeObject lifetimeObject;
-
-        private sealed class LibraryLifetimeObject : CriticalFinalizerObject
-        {
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            public LibraryLifetimeObject()
-            {
-                // Configure the OpenSSL locking on the true initialization
-                // of the library.
-                if (git_libgit2_init() == 1)
-                {
-                    git_openssl_set_locking();
-                }
-            }
-
-            ~LibraryLifetimeObject()
-            {
-                git_libgit2_shutdown();
-            }
-        }
+        private static readonly NativeShutdownObject shutdownObject;
 
         static NativeMethods()
         {
@@ -53,8 +34,30 @@ static NativeMethods()
                     String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", path, Path.PathSeparator, Environment.GetEnvironmentVariable(pathEnvVariable)));
             }
 
-            // See LibraryLifetimeObject description.
-            lifetimeObject = new LibraryLifetimeObject();
+            LoadNativeLibrary();
+            shutdownObject = new NativeShutdownObject();
+        }
+
+        // Avoid inlining this method because otherwise mono's JITter may try
+        // to load the library _before_ we've configured the path.
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void LoadNativeLibrary()
+        {
+            // Configure the OpenSSL locking on the true initialization
+            // of the library.
+            if (git_libgit2_init() == 1)
+            {
+                git_openssl_set_locking();
+            }
+        }
+
+        // Shutdown the native library in a finalizer.
+        private sealed class NativeShutdownObject : CriticalFinalizerObject
+        {
+            ~NativeShutdownObject()
+            {
+                git_libgit2_shutdown();
+            }
         }
 
         [DllImport(libgit2)]