Merge pull request #2 from endjin/master

Fix for System.InvalidOperationException: Could not find the generated type for: C:\Temp\Scripts\TestScript.boo
ayende · Jan 13, 2012 · 24fcdf3 · 24fcdf3
2 parents 15f1dd6 + 1691e3f
commit 24fcdf3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Rhino.DSL/DslCompilerContextCache.cs b/Rhino.DSL/DslCompilerContextCache.cs
@@ -94,8 +94,9 @@ private CompilerContext LoadCompilerContext(string file)
 				{
 					WriteLock(delegate
 					{
-						byte[] bytes = File.ReadAllBytes(file);
-						assembly = Assembly.Load(bytes);
+						// Use Assembly.LoadFrom so that Fusion tries to resolve
+						// any assembly dependencies.
+						assembly = Assembly.LoadFrom(file);
 						assemblyCache[file] = assembly;
 						AssemblyLoaded(file, assembly, true);
 					});