Let's wait with this until after the release.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
index e24d3d904add328c30b62982ded8e8a7de02aa93..dd3927cb019d6ecf75eb952b3e521a481fcc1849 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
@@ -208,7 +208,7 @@ namespace System.Reflection.Emit {
                        if (customBuilder == null)
                                throw new ArgumentNullException ("customBuilder");
 
-                       string attrname = customBuilder.Ctor.ReflectedType.ToString ();
+                       string attrname = customBuilder.Ctor.ReflectedType.FullName;
                        if (attrname == "System.Runtime.CompilerServices.MethodImplAttribute") {
                                byte[] data = customBuilder.Data;
                                int impla; // the (stupid) ctor takes a short or an int ... 

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index fd168fc1a0d72ec8f1c191a1443b112959f8222c..50b6305073da18fc3f68e868b9c8b7307dcaf24f 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,11 +1,3 @@
-2005-06-13  Martin Baulig  <martin@ximian.com>
-
-       * MonoType.cs
-       (MonoType.getFullName): Added `bool assembly_qualified' argument.
-       (MonoType.AssemblyQualifiedName): The interncall now adds the
-       assembly name, so we don't need to do it here.
-       (MonoType.FullName): Use the new getFullName() API for 2.0.
-
 2005-06-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Convert.cs: FromBase64String and FromBase64CharArray are now internal

diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
index 0903ff6c3f1ee17f460a9668cf126886766c80f7..3a12dc9ddeac0d73c96c9630b043af115f5cc1bf 100644 (file)
--- a/mcs/class/corlib/System/Environment.cs
+++ b/mcs/class/corlib/System/Environment.cs
@@ -59,7 +59,7 @@ namespace System {
                 * Changes which are already detected at runtime, like the addition
                 * of icalls, do not require an increment.
                 */
-               private const int mono_corlib_version = 38;
+               private const int mono_corlib_version = 37;
                
                [MonoTODO]
                public enum SpecialFolder

diff --git a/mcs/class/corlib/System/MonoType.cs b/mcs/class/corlib/System/MonoType.cs
index b539bf0cc5c96a968d064628b6e934da141ccdbc..beac7fa2cc3dd8e9ad02bee8742fac1775fb8db3 100644 (file)
--- a/mcs/class/corlib/System/MonoType.cs
+++ b/mcs/class/corlib/System/MonoType.cs
@@ -470,12 +470,12 @@ namespace System
 
                public override string AssemblyQualifiedName {
                        get {
-                               return getFullName (true, true);
+                               return getFullName (false) + ", " + Assembly.UnprotectedGetName ().ToString ();
                        }
                }
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern string getFullName(bool full_name, bool assembly_qualified);
+               private extern string getFullName(bool full_name);
 
                public extern override Type BaseType {
                        [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -484,11 +484,7 @@ namespace System
 
                public override string FullName {
                        get {
-#if NET_2_0 || BOOTSTRAP_NET_2_0
-                               return getFullName (true, false);
-#else
-                               return getFullName (false, false);
-#endif
+                               return getFullName (false);
                        }
                }
 
@@ -569,7 +565,7 @@ namespace System
 
                public override string ToString()
                {
-                       return getFullName (false, false);
+                       return getFullName (true);
                }
 
 #if NET_2_0 || BOOTSTRAP_NET_2_0