Merge pull request #84 from simplic/AssemblyException

Add exception for load assemblies.
icsharpcode · Jan 6, 2022 · d089d65 · d089d65
2 parents 1e1a4ec + dc96001
commit d089d65
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/WpfDesign.Designer/Project/PropertyGrid/Editors/FlatCollectionEditor.xaml.cs b/WpfDesign.Designer/Project/PropertyGrid/Editors/FlatCollectionEditor.xaml.cs
@@ -116,7 +116,20 @@ public void LoadItemsCombobox()
 
 		private IEnumerable<Type> GetInheritedClasses(Type type)
 		{
-			return AppDomain.CurrentDomain.GetAssemblies().Where(x => !x.IsDynamic).SelectMany(x => x.GetTypes().Where(y => y.IsClass && !y.IsAbstract && y.IsSubclassOf(type)));
+			return AppDomain.CurrentDomain.GetAssemblies().Where(x => !x.IsDynamic).SelectMany(x => GetLoadableTypes(x).Where(y => y.IsClass && !y.IsAbstract && y.IsSubclassOf(type)));
+		}
+
+		private IEnumerable<Type> GetLoadableTypes(Assembly assembly)
+		{
+			if (assembly == null) throw new ArgumentNullException("assembly");
+			try
+			{
+				return assembly.GetTypes();
+			}
+			catch (ReflectionTypeLoadException e)
+			{
+				return e.Types.Where(t => t != null);
+			}
 		}
 
 		private void OnAddItemClicked(object sender, RoutedEventArgs e)