fix dll loading in tests

lostmsu · lostmsu · commit 2c1aaefc09c4 · 2021-01-28T11:19:45.000-08:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -54,7 +54,7 @@ private static string GetDefaultDllName(Version version)
             string prefix = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "" : "lib";
             string suffix = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                 ? Invariant($"{version.Major}{version.Minor}")
-                : Invariant($"{version.Major}.{version.Minor}");
+                : Invariant($"{version.Major}.{version.Minor}m");
             string ext = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".dll"
                 : RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? ".dylib"
                 : ".so";
@@ -2534,7 +2534,11 @@ static Delegates()
                 PyThreadState_SetAsyncExcLP64 = (delegate* unmanaged[Cdecl]<ulong, IntPtr, int>)GetFunctionByName("PyThreadState_SetAsyncExc", GetUnmanagedDll(_PythonDll));
             }
 
-            static global::System.IntPtr GetUnmanagedDll(string libraryName) => libraryLoader.Load(libraryName);
+            static global::System.IntPtr GetUnmanagedDll(string libraryName)
+            {
+                if (libraryName is null) return IntPtr.Zero;
+                return libraryLoader.Load(libraryName);
+            }
 
             static global::System.IntPtr GetFunctionByName(string functionName, global::System.IntPtr libraryHandle)
                 => libraryLoader.GetFunction(libraryHandle, functionName);
