Update logic for AbstractDynamicLinqCustomTypeProvider.GetAssemblyTypesWithDynamicLinqTypeAttribute (#703)

* Update logic for AbstractDynamicLinqCustomTypeProvider.GetAssemblyTypesWithDynamicLinqTypeAttribute

* .

* .

Author: StefH

System.Linq.Dynamic.Core.sln.DotSettings

@@ -3,6 +3,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UTC/@EntryIndexedValue">UTC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WASM/@EntryIndexedValue">WASM</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=DLL_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Formattable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=renamer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xunit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/System.Linq.Dynamic.Core/CustomTypeProviders/AbstractDynamicLinqCustomTypeProvider.cs

@@ -83,58 +83,67 @@ protected IEnumerable<Type> FindTypesMarkedWithDynamicLinqTypeAttribute(IEnumera
     /// Gets the assembly types annotated with <see cref="DynamicLinqTypeAttribute"/> in an Exception friendly way.
     /// </summary>
     /// <param name="assemblies">The assemblies to process.</param>
-    /// <returns><see cref="IEnumerable{Type}" /></returns>
-    protected IEnumerable<Type> GetAssemblyTypesWithDynamicLinqTypeAttribute(IEnumerable<Assembly> assemblies)
+    /// <returns>Array of <see cref="Type" /></returns>
+    protected Type[] GetAssemblyTypesWithDynamicLinqTypeAttribute(IEnumerable<Assembly> assemblies)
     {
         Check.NotNull(assemblies);
 
+        var dynamicLinqTypes = new List<Type>();
+
         foreach (var assembly in assemblies)
         {
-            var definedTypes = Type.EmptyTypes;
+            Type[] definedTypes;
 
             try
             {
-                definedTypes = assembly.ExportedTypes.ToArray();
-            }
-            catch (ReflectionTypeLoadException reflectionTypeLoadException)
-            {
-                definedTypes = reflectionTypeLoadException.Types.WhereNotNull().ToArray();
+                definedTypes = assembly.GetExportedTypes();
             }
             catch
             {
                 // Ignore all other exceptions
+                definedTypes = Type.EmptyTypes;
             }
 
-            var filteredAndDistinct = definedTypes
-                .Where(t => t.GetTypeInfo().IsDefined(typeof(DynamicLinqTypeAttribute), false))
-                .Distinct();
-
-            foreach (var definedType in filteredAndDistinct)
+            foreach (var definedType in definedTypes)
             {
-                yield return definedType;
+                try
+                {
+                    if (definedType.GetTypeInfo().IsDefined(typeof(DynamicLinqTypeAttribute), false))
+                    {
+                        dynamicLinqTypes.Add(definedType);
+                    }
+                }
+                catch
+                {
+                    // Ignore
+                }
             }
         }
+
+        return dynamicLinqTypes.Distinct().ToArray();
     }
 #else                
     /// <summary>
     /// Gets the assembly types annotated with <see cref="DynamicLinqTypeAttribute"/> in an Exception friendly way.
     /// </summary>
     /// <param name="assemblies">The assemblies to process.</param>
-    /// <returns><see cref="IEnumerable{Type}" /></returns>
-    protected IEnumerable<Type> GetAssemblyTypesWithDynamicLinqTypeAttribute(IEnumerable<Assembly> assemblies)
+    /// <returns>Array of <see cref="Type" /></returns>
+    protected Type[] GetAssemblyTypesWithDynamicLinqTypeAttribute(IEnumerable<Assembly> assemblies)
     {
         Check.NotNull(assemblies);
 
+        var dynamicLinqTypes = new List<Type>();
+
 #if !NET5_0_OR_GREATER
         assemblies = assemblies.Where(a => !a.GlobalAssemblyCache).ToArray(); // Skip System DLL's
 #endif
         foreach (var assembly in assemblies)
         {
-            var definedTypes = Type.EmptyTypes;
+            Type[] definedTypes;
 
             try
             {
-                definedTypes = assembly.GetExportedTypes().ToArray();
+                definedTypes = assembly.GetTypes();
             }
             catch (ReflectionTypeLoadException reflectionTypeLoadException)
             {
@@ -143,29 +152,26 @@ protected IEnumerable<Type> GetAssemblyTypesWithDynamicLinqTypeAttribute(IEnumer
             catch
             {
                 // Ignore all other exceptions
+                definedTypes = Type.EmptyTypes;
             }
 
-            var filtered = new List<Type>();
             foreach (var definedType in definedTypes)
             {
                 try
                 {
                     if (definedType.IsDefined(typeof(DynamicLinqTypeAttribute), false))
                     {
-                        filtered.Add(definedType);
+                        dynamicLinqTypes.Add(definedType);
                     }
                 }
                 catch
                 {
                     // Ignore
                 }
             }
-
-            foreach (var definedType in filtered.Distinct().ToArray())
-            {
-                yield return definedType;
-            }
         }
+
+        return dynamicLinqTypes.Distinct().ToArray();
     }
 #endif
 }