Merge pull request #2047 from danielmue/bugfix/AssemblyLoaderBug

Fixes TypeLoadException from static constructor in AppDomainAssemblyT…
NancyFx · Sep 4, 2015 · 6b7ddcc · 6b7ddcc
2 parents 078b55d + 87825c5
commit 6b7ddcc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Nancy/Extensions/AssemblyExtensions.cs b/src/Nancy/Extensions/AssemblyExtensions.cs
@@ -31,7 +31,10 @@ public static Type[] SafeGetExportedTypes(this Assembly assembly)
             {
                 types = new Type[] { };
             }
-
+            catch (FileLoadException) {
+                // probably assembly version conflict
+                types = new Type[] { };
+            }
             return types;
         }
     }