2004-05-01 Todd Berman <tberman@sevenl.net>

        * driver.cs: Try a LoadFrom before a Load, this checks the current
        path. This is currently a bug in mono that is be fixed, however, this
        provides a workaround for now. This will be removed when the bug
        is fixed.

svn path=/trunk/mcs/; revision=26523

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index ab2abe3e37eeaabfd4e0eb9efd70e2076348c0e3..d60d1ef3d19996a4f750fac7462d8c31e7169749 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-01  Todd Berman  <tberman@sevenl.net>
+
+       * driver.cs: Try a LoadFrom before a Load, this checks the current
+       path. This is currently a bug in mono that is be fixed, however, this
+       provides a workaround for now. This will be removed when the bug
+       is fixed.
+
 2004-05-01  Sebastien Pouliot  <sebastien@ximian.com>
 
        * CryptoConvert.cs: Updated to latest version. Fix issue with 

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index c9123274a2a25bbc508c74a3e430695a55c0b54d..d1a7ca2231a62b27d70cc8f8b6b019466c0f5191 100755 (executable)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -296,6 +296,8 @@ namespace Mono.CSharp
                                        a = Assembly.LoadFrom (assembly);
                                } else {
                                        a = LoadAssemblyFromGac (assembly);
+                                       if (a == null)
+                                               a = Assembly.LoadFrom (assembly);
                                        if (a == null)
                                                a = Assembly.Load (assembly);
                                }