fix ResolveReaderType() for generics (#1558)

kniEngine · May 12, 2024 · e2f17c0 · e2f17c0
1 parent 1c7e738
commit e2f17c0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Xna.Framework.Content/Content/ContentTypeReaderManager.cs b/src/Xna.Framework.Content/Content/ContentTypeReaderManager.cs
@@ -241,6 +241,10 @@ internal static Type ResolveReaderType(string readerTypeName)
                 return readerType;
 
             // map XNA build-in TypeReaders
+            resolvedReaderTypeName = readerTypeName.Replace(", Microsoft.Xna.Framework", string.Format(", {0}", "Xna.Framework")); // e.g. "Microsoft.Xna.Framework.Content.ListReader`1[[Microsoft.Xna.Framework.Rectangle, Microsoft.Xna.Framework]]
+            readerType = Type.GetType(resolvedReaderTypeName);
+            if (readerType != null)
+                return readerType;
             resolvedReaderTypeName = readerTypeName + string.Format(", {0}", _contentGraphicsAssemblyName);
             readerType = Type.GetType(resolvedReaderTypeName);
             if (readerType != null)
@@ -255,6 +259,10 @@ internal static Type ResolveReaderType(string readerTypeName)
                 return readerType;
 
             // map MonoGame build-in TypeReaders
+            resolvedReaderTypeName = readerTypeName.Replace(", MonoGame.Framework", string.Format(", {0}", "Xna.Framework")); // e.g. "Microsoft.Xna.Framework.Content.ListReader`1[[Microsoft.Xna.Framework.Rectangle, MonoGame.Framework]]
+            readerType = Type.GetType(resolvedReaderTypeName);
+            if (readerType != null)
+                return readerType;
             resolvedReaderTypeName = readerTypeName.Replace(", MonoGame.Framework", string.Format(", {0}", _contentAssemblyName));
             readerType = Type.GetType(resolvedReaderTypeName);
             if (readerType != null)