Author: zoltan
Date: 2008-02-20 14:07:03 -0500 (Wed, 20 Feb 2008)
New Revision: 96288
Modified:
branches/mono-1-9/mono/mono/metadata/ChangeLog
branches/mono-1-9/mono/mono/metadata/assembly.c
Log:
Merge from HEAD.
Modified: branches/mono-1-9/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-9/mono/mono/metadata/ChangeLog 2008-02-20 19:04:51 UTC
(rev 96287)
+++ branches/mono-1-9/mono/mono/metadata/ChangeLog 2008-02-20 19:07:03 UTC
(rev 96288)
@@ -1,3 +1,8 @@
+2008-02-20 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * assembly.c (mono_assembly_load_from_full): Return the non-refonly
corlib for
+ ref-only requests for compatibility with MS.
+
2008-02-11 Geoff Norton <[EMAIL PROTECTED]>
* loader.c: [Backport] Guard and dereference against inflated generic
Modified: branches/mono-1-9/mono/mono/metadata/assembly.c
===================================================================
--- branches/mono-1-9/mono/mono/metadata/assembly.c 2008-02-20 19:04:51 UTC
(rev 96287)
+++ branches/mono-1-9/mono/mono/metadata/assembly.c 2008-02-20 19:07:03 UTC
(rev 96288)
@@ -1426,6 +1426,15 @@
mono_assembly_fill_assembly_name (image, &ass->aname);
+ if (refonly && strcmp (ass->aname.name, "mscorlib") == 0) {
+ // MS.NET doesn't support loading other mscorlibs
+ g_free (ass);
+ g_free (base_dir);
+ mono_image_close (image);
+ *status = MONO_IMAGE_OK;
+ return mono_defaults.corlib->assembly;
+ }
+
/* Add a non-temporary reference because of ass->image */
mono_image_addref (image);
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
