From a5ba3de533132df71f72673ba98e3294216dc9b2 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Wed, 7 Oct 2020 04:01:10 +0200
Subject: [PATCH] fixed an issue where types would not correctly be loaded from
 referenced assemblies

---
 Contentless/Contentless.nuspec |  2 +-
 Contentless/ImporterInfo.cs    |  4 ++++
 Contentless/Program.cs         |  2 +-
 MonoGame                       |  2 +-
 Test/Content/Content.mgcb      | 15 +++++++++++++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Contentless/Contentless.nuspec b/Contentless/Contentless.nuspec
index 79ab041..0bdbc8c 100644
--- a/Contentless/Contentless.nuspec
+++ b/Contentless/Contentless.nuspec
@@ -2,7 +2,7 @@
 <package>
     <metadata>
         <id>Contentless</id>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
         <authors>Ellpeck</authors>
         <description>A tool for MonoGame that automatically handles adding assets to the Content Pipeline project</description>
         <tags>monogame mono xna content pipeline mgcb builder tool library</tags>
diff --git a/Contentless/ImporterInfo.cs b/Contentless/ImporterInfo.cs
index 4eedfe3..9ca6630 100644
--- a/Contentless/ImporterInfo.cs
+++ b/Contentless/ImporterInfo.cs
@@ -12,5 +12,9 @@ namespace Contentless {
             this.Type = type;
         }
 
+        public override string ToString() {
+            return this.Type.Name;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Contentless/Program.cs b/Contentless/Program.cs
index 5d8b273..85db459 100644
--- a/Contentless/Program.cs
+++ b/Contentless/Program.cs
@@ -149,7 +149,7 @@ namespace Contentless {
             var processors = new List<string>();
             foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) {
                 try {
-                    foreach (var type in assembly.GetExportedTypes()) {
+                    foreach (var type in assembly.GetTypes()) {
                         var importer = (ContentImporterAttribute) type.GetCustomAttribute(typeof(ContentImporterAttribute), true);
                         if (importer != null)
                             importers.Add(new ImporterInfo(importer, type));
diff --git a/MonoGame b/MonoGame
index 9770838..133ef7c 160000
--- a/MonoGame
+++ b/MonoGame
@@ -1 +1 @@
-Subproject commit 97708388e9adf6cb2ff66171ed0be5d4183e6b63
+Subproject commit 133ef7c79d1e13152c543986e4335b6e01740ec4
diff --git a/Test/Content/Content.mgcb b/Test/Content/Content.mgcb
index bfb81ab..d212aa3 100644
--- a/Test/Content/Content.mgcb
+++ b/Test/Content/Content.mgcb
@@ -45,3 +45,18 @@
 /processor:TextureProcessor
 /build:Textures/Exclude.png
 
+#begin Json/Test.json
+/importer:TexturePackerJsonImporter
+/processor:TexturePackerProcessor
+/build:Json/Test.json
+
+#begin Tiled/Map.tmx
+/importer:TiledMapImporter
+/processor:TiledMapProcessor
+/build:Tiled/Map.tmx
+
+#begin Tiled/Tileset.tsx
+/importer:TiledMapTilesetImporter
+/processor:TiledMapTilesetProcessor
+/build:Tiled/Tileset.tsx
+