Merge remote-tracking branch 'upstream/develop' into develop

MonoGame · Dec 23, 2023 · 76c7e64 · 76c7e64
2 parents 2784277 + 5fc1d04
commit 76c7e64
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/MonoGame.Framework/Content/ContentTypeReaderManager.cs b/MonoGame.Framework/Content/ContentTypeReaderManager.cs
@@ -21,7 +21,7 @@ public sealed class ContentTypeReaderManager
 
         private static readonly string _assemblyName;
 
-        private static readonly bool _isRunningOnNetCore = Type.GetType("System.Private.CoreLib") != null;
+        private static readonly bool _isRunningOnNetCore = typeof(object).Assembly.GetName().Name == "System.Private.CoreLib";
 
         static ContentTypeReaderManager()
         {
@@ -51,7 +51,7 @@ internal ContentTypeReader[] LoadAssetReaders(ContentReader reader)
             // Trick to prevent the linker removing the code, but not actually execute the code
             if (falseflag)
             {
-                // Dummy variables required for it to work on iDevices ** DO NOT DELETE ** 
+                // Dummy variables required for it to work on iDevices ** DO NOT DELETE **
                 // This forces the classes not to be optimized out when deploying to iDevices
                 var hByteReader = new ByteReader();
                 var hSByteReader = new SByteReader();
@@ -152,7 +152,7 @@ internal ContentTypeReader[] LoadAssetReaders(ContentReader reader)
                                 catch (TargetInvocationException ex)
                                 {
                                     // If you are getting here, the Mono runtime is most likely not able to JIT the type.
-                                    // In particular, MonoTouch needs help instantiating types that are only defined in strings in Xnb files. 
+                                    // In particular, MonoTouch needs help instantiating types that are only defined in strings in Xnb files.
                                     throw new InvalidOperationException(
                                         "Failed to get default constructor for ContentTypeReader. To work around, add a creation function to ContentTypeReaderManager.AddTypeCreator() " +
                                         "with the following failed type string: " + originalReaderTypeString, ex);
@@ -198,7 +198,7 @@ internal ContentTypeReader[] LoadAssetReaders(ContentReader reader)
         /// </summary>
         /// <remarks>
         /// Supports multiple generic types (e.g. Dictionary&lt;TKey,TValue&gt;) and nested generic types (e.g. List&lt;List&lt;int&gt;&gt;).
-        /// </remarks> 
+        /// </remarks>
         /// <param name="type">
         /// A <see cref="System.String"/>
         /// </param>

diff --git a/MonoGame.Framework/Input/Touch/TouchPanel.cs b/MonoGame.Framework/Input/Touch/TouchPanel.cs
@@ -1,7 +1,7 @@
 #region License
 // /*
 // Microsoft Public License (Ms-PL)
-// XnaTouch - Copyright © 2009-2010 The XnaTouch Team
+// XnaTouch - Copyright (C) 2009-2010 The XnaTouch Team
 //
 // All rights reserved.
 // 

diff --git a/MonoGame.Framework/Platform/Utilities/FuncLoader.Desktop.cs b/MonoGame.Framework/Platform/Utilities/FuncLoader.Desktop.cs
@@ -38,7 +38,7 @@ private class OSX
         public static IntPtr LoadLibraryExt(string libname)
         {
             var ret = IntPtr.Zero;
-            var assemblyLocation = Path.GetDirectoryName(typeof(FuncLoader).Assembly.Location) ?? "./";
+            var assemblyLocation = Path.GetDirectoryName(System.AppContext.BaseDirectory) ?? "./";
 
             // Try .NET Framework / mono locations
             if (CurrentPlatform.OS == OS.MacOSX)