From 83e96bb2e385e43bc46decbdbdfec9da5c943dd4 Mon Sep 17 00:00:00 2001
From: IS4 <illidans4@gmail.com>
Date: Sun, 11 Jun 2023 19:53:17 +0200
Subject: [PATCH] include type forwarders when looking for components (.NET
 Core only)

---
 SFI.Application/ComponentInspector.cs |  2 +-
 SFI.Application/Tools/Extensions.cs   | 34 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 SFI.Application/Tools/Extensions.cs

diff --git a/SFI.Application/ComponentInspector.cs b/SFI.Application/ComponentInspector.cs
index 43927dcc..5d7a5011 100644
--- a/SFI.Application/ComponentInspector.cs
+++ b/SFI.Application/ComponentInspector.cs
@@ -203,7 +203,7 @@ protected virtual async ValueTask<int> LoadIntoCollections(ComponentType compone
         /// <returns>The collection of all applicable component types.</returns>
         protected virtual IEnumerable<ComponentType> OpenAssembly(Assembly assembly, IServiceProvider serviceProvider)
         {
-            foreach(var type in assembly.ExportedTypes)
+            foreach(var type in assembly.ExportedTypes.Concat(assembly.GetForwardedTypes().Where(t => t.IsPublic)))
             {
                 // Only yield concrete instantiable browsable types
                 if(!type.IsAbstract && !type.IsGenericTypeDefinition && IsTypeLoadable(type))
diff --git a/SFI.Application/Tools/Extensions.cs b/SFI.Application/Tools/Extensions.cs
new file mode 100644
index 00000000..59e112cd
--- /dev/null
+++ b/SFI.Application/Tools/Extensions.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Reflection;
+
+namespace IS4.SFI.Application.Tools
+{
+    /// <summary>
+    /// Provides extension methods for application-related classes.
+    /// </summary>
+    public static class Extensions
+    {
+        static readonly Func<Assembly, Type[]> getForwardedTypes;
+
+        static Extensions()
+        {
+            var forwardedTypesMethod = typeof(Assembly).GetMethod("GetForwardedTypes", Type.EmptyTypes);
+            if(forwardedTypesMethod != null)
+            {
+                getForwardedTypes = (Func<Assembly, Type[]>)Delegate.CreateDelegate(typeof(Func<Assembly, Type[]>), forwardedTypesMethod);
+            }else{
+                getForwardedTypes = _ => Array.Empty<Type>();
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the collection of forwarded types in <paramref name="assembly"/>.
+        /// </summary>
+        /// <param name="assembly">The assembly to browse.</param>
+        /// <returns>The array of types forwarded to another assembly.</returns>
+        public static Type[] GetForwardedTypes(this Assembly assembly)
+        {
+            return getForwardedTypes(assembly);
+        }
+    }
+}