Skip to content
This repository has been archived by the owner on Aug 28, 2021. It is now read-only.

Commit

Permalink
Revert "Moved a call to get types for a referenced assembly into the …
Browse files Browse the repository at this point in the history
…SafeLoadAssembly method."

This reverts commit 7896b8b.
  • Loading branch information
teocomi committed Jul 29, 2020
1 parent 3d6eaf9 commit a197e3d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions SpeckleCore/AssemblyCatalogue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ private IEnumerable<Assembly> LoadSpeckleReferencingAssemblies( IEnumerable<Asse
var assembly = SafeLoadAssembly( AppDomain.CurrentDomain, unloadedAssemblyName );
if ( assembly != null )
{
assemblies.Add(assembly);
var res = assembly.GetTypes();
var copy = res;

assemblies.Add( assembly );
}
}
}
Expand All @@ -114,10 +117,7 @@ private static Assembly SafeLoadAssembly( AppDomain domain, AssemblyName assembl
{
try
{
var assembly = domain.Load( assemblyName );
//Check that types can be loaded and there are no missing references etc
var res = assembly.GetTypes();
return assembly;
return domain.Load( assemblyName );
}
catch
{
Expand Down

0 comments on commit a197e3d

Please sign in to comment.