Merge pull request #148 from speckleworks/nic/load-assembly-improvement

Moved a call to get types for a referenced assembly into the SafeLoad…
speckleworks · Jun 12, 2020 · 3d6eaf9 · 3d6eaf9
2 parents 02059ec + 7896b8b
commit 3d6eaf9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/SpeckleCore/AssemblyCatalogue.cs b/SpeckleCore/AssemblyCatalogue.cs
@@ -89,10 +89,7 @@ private IEnumerable<Assembly> LoadSpeckleReferencingAssemblies( IEnumerable<Asse
               var assembly = SafeLoadAssembly( AppDomain.CurrentDomain, unloadedAssemblyName );
               if ( assembly != null )
               {
-                var res = assembly.GetTypes();
-                var copy = res;
-
-                assemblies.Add( assembly );
+                assemblies.Add(assembly);
               }
             }
           }
@@ -117,7 +114,10 @@ private static Assembly SafeLoadAssembly( AppDomain domain, AssemblyName assembl
     {
       try
       {
-        return domain.Load( assemblyName );
+        var assembly = domain.Load( assemblyName );
+        //Check that types can be loaded and there are no missing references etc
+        var res = assembly.GetTypes();
+        return assembly;
       }
       catch
       {