Let's wait with this until after the release.

svn path=/trunk/mcs/; revision=45871
mono · Jun 13, 2005 · 45d469f · 45d469f
1 parent 2acc83f
commit 45d469f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
@@ -208,7 +208,7 @@ public ParameterBuilder DefineParameter(int iSequence, ParameterAttributes attri
 			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
@@ -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
@@ -59,7 +59,7 @@ private Environment ()
 		 * 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
@@ -470,12 +470,12 @@ protected override bool IsValueTypeImpl ()
 
 		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 @@ protected override bool IsValueTypeImpl ()
 
 		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 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)
 
 		public override string ToString()
 		{
-			return getFullName (false, false);
+			return getFullName (true);
 		}
 
 #if NET_2_0 || BOOTSTRAP_NET_2_0