2008-02-07 Jb Evain <jbevain@novell.com>

	* Mono.Cecil/BaseAssemblyResolver.cs:
		deal with 2.1 corlib on Mono.

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

diff --git a/mcs/class/Mono.Cecil/ChangeLog b/mcs/class/Mono.Cecil/ChangeLog
index ea50faf7628de63f3a18269a0886972d0d1ddbb2..4877bdc29ca503c54923f016f175945cbbb8ef30 100644 (file)
--- a/mcs/class/Mono.Cecil/ChangeLog
+++ b/mcs/class/Mono.Cecil/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-07  Jb Evain  <jbevain@novell.com>
+
+       * Mono.Cecil/BaseAssemblyResolver.cs:
+               deal with 2.1 corlib on Mono.
+
 2008-02-07  Jb Evain  <jbevain@novell.com>
 
        * Mono.Cecil/MethodDefinition.cs:

diff --git a/mcs/class/Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs b/mcs/class/Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs
index 3d276cf0c80fa4b9fecc97fbfa637755cfc24d64..499c967198fe47822ee49a63aa6a69e203372966 100644 (file)
--- a/mcs/class/Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs
+++ b/mcs/class/Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs
@@ -134,9 +134,12 @@ namespace Mono.Cecil {
                        if (OnMono ()) {
                                if (reference.Version.Major == 1)
                                        path = Path.Combine (path, "1.0");
-                               else if (reference.Version.Major == 2)
-                                       path = Path.Combine (path, "2.0");
-                               else
+                               else if (reference.Version.Major == 2) {
+                                       if (reference.Version.Minor == 1)
+                                               path = Path.Combine (path, "2.1");
+                                       else
+                                               path = Path.Combine (path, "2.0");
+                               } else
                                        throw new NotSupportedException ("Version not supported: " + reference.Version);
                        } else {
                                if (reference.Version.ToString () == "1.0.3300.0")