Merge pull request #337 from PHOENIXCONTACT/hotfix/exported-types

Fix LoadComponents for private types with missing reference
PHOENIXCONTACT · Aug 30, 2023 · 445ab0c · 445ab0c
2 parents 4a5a956 + 41e0d2d
commit 445ab0c
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/src/Moryx.Container/CastleContainer.cs b/src/Moryx.Container/CastleContainer.cs
@@ -160,7 +160,28 @@ public virtual void LoadComponents<T>(Predicate<Type> condition) where T : class
             {
                 _knownTypes = ReflectionTool.GetAssemblies()
                     .Where(a => a.GetCustomAttribute<ComponentLoaderIgnoreAttribute>() == null)
-                    .SelectMany(a => a.GetTypes())
+                    .SelectMany(a => 
+                    {
+                        // TODO: Replace with exported types in MORYX 8
+                        try
+                        {
+                            // This should only return exported types
+                            return a.GetTypes();
+                        }
+                        catch
+                        {
+                            // Fall back to exported types in case of exception
+                            try
+                            {
+                                return a.GetExportedTypes();
+                            }
+                            catch
+                            {
+                                // Give up
+                                return new Type[0];
+                            }
+                        }
+                    })
                     .Where(t => t.GetCustomAttribute<RegistrationAttribute>(true) != null).ToArray();
             }