diff --git a/src/libraries/Common/tests/System/Drawing/Helpers.cs b/src/libraries/Common/tests/System/Drawing/Helpers.cs
index d6dc87248470e9..1b41f92c8c939a 100644
--- a/src/libraries/Common/tests/System/Drawing/Helpers.cs
+++ b/src/libraries/Common/tests/System/Drawing/Helpers.cs
@@ -41,6 +41,10 @@ public static bool GetIsWindowsOrAtLeastLibgdiplus6()
{
installedVersion = new Version(GetLibgdiplusVersion());
}
+ catch (DllNotFoundException)
+ {
+ return false;
+ }
catch (EntryPointNotFoundException)
{
return false;
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Unix.cs
index a0a4968d62f8e5..591e36d8b35e9e 100644
--- a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Unix.cs
+++ b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.Unix.cs
@@ -29,15 +29,12 @@ internal unsafe partial class Gdip
internal static IntPtr LoadNativeLibrary()
{
- string libraryName;
+ var assembly = System.Reflection.Assembly.GetExecutingAssembly();
IntPtr lib = IntPtr.Zero;
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
- libraryName = "libgdiplus.dylib";
-
- var assembly = System.Reflection.Assembly.GetExecutingAssembly();
- NativeLibrary.TryLoad(libraryName, assembly, default, out lib);
+ NativeLibrary.TryLoad("libgdiplus.dylib", assembly, default, out lib);
}
else
{
@@ -45,10 +42,7 @@ internal static IntPtr LoadNativeLibrary()
// The mono project, where libgdiplus originated, allowed both of the names below to be used, via
// a global configuration setting. We prefer the "unversioned" shared object name, and fallback to
// the name suffixed with ".0".
- libraryName = "libgdiplus.so";
-
- var assembly = System.Reflection.Assembly.GetExecutingAssembly();
- if (!NativeLibrary.TryLoad(libraryName, assembly, default, out lib))
+ if (!NativeLibrary.TryLoad("libgdiplus.so", assembly, default, out lib))
{
NativeLibrary.TryLoad("libgdiplus.so.0", assembly, default, out lib);
}
diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
index a30bfd2bf5f351..610e7ec4b39623 100644
--- a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
+++ b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
@@ -34,7 +34,7 @@
-
+
diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTesst.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTests.cs
similarity index 100%
rename from src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTesst.cs
rename to src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTests.cs
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs
index 1cf9efd4be8661..54f640c2c64d0a 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs
@@ -1366,7 +1366,8 @@ public static IEnumerable