Author: jbevain
Date: 2006-08-21 05:50:23 -0400 (Mon, 21 Aug 2006)
New Revision: 64135
Modified:
trunk/cecil/lib/ChangeLog
trunk/cecil/lib/Mono.Cecil/BaseAssemblyResolver.cs
Log:
2006-08-21 Jb Evain <[EMAIL PROTECTED]>
* Mono.Cecil/BaseAssemblyResolver.cs:
Look for assemblies in ./ first
Modified: trunk/cecil/lib/ChangeLog
===================================================================
--- trunk/cecil/lib/ChangeLog 2006-08-21 09:38:31 UTC (rev 64134)
+++ trunk/cecil/lib/ChangeLog 2006-08-21 09:50:23 UTC (rev 64135)
@@ -1,3 +1,8 @@
+2006-08-21 Jb Evain <[EMAIL PROTECTED]>
+
+ * Mono.Cecil/BaseAssemblyResolver.cs:
+ Look for assemblies in ./ first
+
2006-08-17 Jb Evain <[EMAIL PROTECTED]>
* Mono.Cecil/BaseAssemblyResolver.cs:
Modified: trunk/cecil/lib/Mono.Cecil/BaseAssemblyResolver.cs
===================================================================
--- trunk/cecil/lib/Mono.Cecil/BaseAssemblyResolver.cs 2006-08-21 09:38:31 UTC
(rev 64134)
+++ trunk/cecil/lib/Mono.Cecil/BaseAssemblyResolver.cs 2006-08-21 09:50:23 UTC
(rev 64135)
@@ -42,11 +42,6 @@
public virtual AssemblyDefinition Resolve
(AssemblyNameReference name)
{
- if (name.Name == "mscorlib")
- return GetCorlib (name);
- else if (IsInGac (name))
- return AssemblyFactory.GetAssembly (GetFromGac
(name));
-
string [] exts = new string [] { ".dll", ".exe" };
string [] dirs = new string [] { ".", "bin" };
@@ -58,6 +53,11 @@
}
}
+ if (name.Name == "mscorlib")
+ return GetCorlib (name);
+ else if (IsInGac (name))
+ return AssemblyFactory.GetAssembly (GetFromGac
(name));
+
throw new FileNotFoundException ("Could not resolve: "
+ name);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
