diff options
| author | Martin Baulig <martin@novell.com> | 2005-06-13 17:21:28 +0400 |
|---|---|---|
| committer | Martin Baulig <martin@novell.com> | 2005-06-13 17:21:28 +0400 |
| commit | 8c661797d1339aad9a518273061ea6d42eca1896 (patch) | |
| tree | 9b702d1dc03b12f7cbac3b7beb84feb50d3343ce /mcs | |
| parent | fad648c32d448fa70c85df06ea5ec8b06826d567 (diff) | |
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.
svn path=/trunk/mcs/; revision=45864
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs | 2 | ||||
| -rw-r--r-- | mcs/class/corlib/System/ChangeLog | 8 | ||||
| -rw-r--r-- | mcs/class/corlib/System/Environment.cs | 2 | ||||
| -rw-r--r-- | mcs/class/corlib/System/MonoType.cs | 12 |
4 files changed, 18 insertions, 6 deletions
diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs index dd3927cb019..e24d3d904ad 100644 --- 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.FullName; + string attrname = customBuilder.Ctor.ReflectedType.ToString (); 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 50b6305073d..fd168fc1a0d 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,3 +1,11 @@ +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 3a12dc9ddea..0903ff6c3f1 100644 --- 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 = 37; + private const int mono_corlib_version = 38; [MonoTODO] public enum SpecialFolder diff --git a/mcs/class/corlib/System/MonoType.cs b/mcs/class/corlib/System/MonoType.cs index beac7fa2cc3..b539bf0cc5c 100644 --- 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 (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,11 @@ namespace System public override string FullName { get { - return getFullName (false); +#if NET_2_0 || BOOTSTRAP_NET_2_0 + return getFullName (true, false); +#else + return getFullName (false, false); +#endif } } @@ -565,7 +569,7 @@ namespace System public override string ToString() { - return getFullName (true); + return getFullName (false, false); } #if NET_2_0 || BOOTSTRAP_NET_2_0 |