浏览代码

2005-06-13 Martin Baulig <[email protected]>

	* 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.


svn path=/trunk/mcs/; revision=46036
Martin Baulig 20 年之前
父节点
当前提交
262d98239b
共有 3 个文件被更改,包括 13 次插入5 次删除
  1. 8 0
      mcs/class/corlib/System/ChangeLog
  2. 1 1
      mcs/class/corlib/System/Environment.cs
  3. 4 4
      mcs/class/corlib/System/MonoType.cs

+ 8 - 0
mcs/class/corlib/System/ChangeLog

@@ -1,3 +1,11 @@
+2005-06-13  Martin Baulig  <[email protected]>
+
+	* 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.
+
 2005-06-14  Sebastien Pouliot  <[email protected]>
 
 	* Char.cs: ToLowerInvariant and ToUpperInvariant are now public in 

+ 1 - 1
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 = 37;
+		private const int mono_corlib_version = 38;
                
 		[MonoTODO]
 		public enum SpecialFolder

+ 4 - 4
mcs/class/corlib/System/MonoType.cs

@@ -470,12 +470,12 @@ namespace System
 
 		public override string AssemblyQualifiedName {
 			get {
-				return getFullName (false) + ", " + Assembly.UnprotectedGetName ().ToString ();
+				return getFullName (true, true);
 			}
 		}
 
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
-		private extern string getFullName(bool full_name);
+		private extern string getFullName(bool full_name, bool assembly_qualified);
 
 		public extern override Type BaseType {
 			[MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -484,7 +484,7 @@ namespace System
 
 		public override string FullName {
 			get {
-				return getFullName (false);
+				return getFullName (true, false);
 			}
 		}
 
@@ -565,7 +565,7 @@ namespace System
 
 		public override string ToString()
 		{
-			return getFullName (true);
+			return getFullName (false, false);
 		}
 
 #if NET_2_0 || BOOTSTRAP_NET_2_0