Merge pull request #106 from fdanny/develop

tonyroberts · tonyroberts · commit 0333faaaafcc · 2015-10-12T10:09:28.000+01:00
resolve #98
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -208,6 +208,24 @@ public static Assembly LoadAssemblyPath(string name) {
             return assembly;
         }
 
+        /// <summary>  
+        /// Loads an assembly using full path.  
+        /// </summary>  
+        /// <param name="name"></param>  
+        /// <returns></returns>  
+        public static Assembly LoadAssemblyFullPath(string name) {
+            Assembly assembly = null;
+            if (Path.IsPathRooted(name)) {
+                if (!Path.HasExtension(name))
+                    name = name + ".dll";
+                if (File.Exists(name)) {
+                    try { assembly = Assembly.LoadFrom(name); }
+                    catch { }
+                }
+            }
+            return assembly;
+        }
+
         //===================================================================
         // Returns an assembly that's already been loaded
         //===================================================================
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -409,11 +409,15 @@ public static Assembly AddReference(string name)
             {
                 assembly = AssemblyManager.LoadAssembly(name);
             }
+            if (assembly == null) {
+                assembly = AssemblyManager.LoadAssemblyFullPath(name);
+            }
             if (assembly == null)
             {
                 string msg = String.Format("Unable to find assembly '{0}'.", name);
                 throw new System.IO.FileNotFoundException(msg);
             }
+            
             return assembly ;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -409,11 +409,15 @@ public static Assembly AddReference(string name)`
`409`	`409`	`{`
`410`	`410`	`assembly = AssemblyManager.LoadAssembly(name);`
`411`	`411`	`}`
	`412`	`+ if (assembly == null) {`
	`413`	`+ assembly = AssemblyManager.LoadAssemblyFullPath(name);`
	`414`	`+ }`
`412`	`415`	`if (assembly == null)`
`413`	`416`	`{`
`414`	`417`	`string msg = String.Format("Unable to find assembly '{0}'.", name);`
`415`	`418`	`throw new System.IO.FileNotFoundException(msg);`
`416`	`419`	`}`
	`420`	`+`
`417`	`421`	`return assembly ;`
`418`	`422`	`}`
`419`	`423`