Mobile should not have the COM types set.

diff --git a/mcs/class/corlib/System.Reflection/Assembly.cs b/mcs/class/corlib/System.Reflection/Assembly.cs
index b21fcab572561e9aa5720ed0b81b531f1a60d230..f32fbca9eea31c1d8849645b4eeb72f6b81fcb28 100644 (file)
--- a/mcs/class/corlib/System.Reflection/Assembly.cs
+++ b/mcs/class/corlib/System.Reflection/Assembly.cs
@@ -50,7 +50,7 @@ namespace System.Reflection {
        [ClassInterface(ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
 #if MOBILE
-       public partial class Assembly : ICustomAttributeProvider, _Assembly {
+       public partial class Assembly : ICustomAttributeProvider {
 #elif NET_4_0
        public abstract class Assembly : ICustomAttributeProvider, _Assembly, IEvidenceFactory, ISerializable {
 #else
@@ -458,12 +458,14 @@ namespace System.Reflection {
                        return LoadFrom (fullName);
                }
 
+#if !MOBILE
                Type _Assembly.GetType ()
                {
                        // Required or object::GetType becomes virtual final
                        return base.GetType ();
                }               
-               
+#endif
+
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private extern static Assembly LoadFrom (String assemblyFile, bool refonly);
 

diff --git a/mcs/class/corlib/System.Reflection/AssemblyName.cs b/mcs/class/corlib/System.Reflection/AssemblyName.cs
index 1daa3d0e5e7b3137dc641e41a1e43711f629c8cc..8c95bbe9ec870987459acccc92048bf7bf47b7c8 100644 (file)
--- a/mcs/class/corlib/System.Reflection/AssemblyName.cs
+++ b/mcs/class/corlib/System.Reflection/AssemblyName.cs
@@ -54,8 +54,11 @@ namespace System.Reflection {
        [Serializable]
        [ClassInterfaceAttribute (ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
+#if MOBILE
+       public sealed class AssemblyName  : ICloneable, ISerializable, IDeserializationCallback {
+#else
        public sealed class AssemblyName  : ICloneable, ISerializable, IDeserializationCallback, _AssemblyName {
-
+#endif
 #pragma warning disable 169
                #region Synch with object-internals.h
                string name;
@@ -401,6 +404,7 @@ namespace System.Reflection {
                        return aname;
                }
 
+#if !MOBILE
                void _AssemblyName.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -421,5 +425,7 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
+
        }
 }

diff --git a/mcs/class/corlib/System.Reflection/ConstructorInfo.cs b/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
index 37c9792c34c84638850ebda554ce8b37b12464f0..fd81dcb1b39fc79c235a1552b0af2cb73d3cf805 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
+++ b/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
@@ -37,8 +37,11 @@ namespace System.Reflection {
        [ComDefaultInterfaceAttribute (typeof (_ConstructorInfo))]      
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
+#if MOBILE
+       public abstract class ConstructorInfo : MethodBase {
+#else
        public abstract class ConstructorInfo : MethodBase, _ConstructorInfo {
-
+#endif
                [ComVisible (true)]
                public static readonly string ConstructorName = ".ctor";
                [ComVisible (true)]
@@ -62,6 +65,8 @@ namespace System.Reflection {
                public abstract object Invoke (BindingFlags invokeAttr, Binder binder, object[] parameters,
                                               CultureInfo culture);
 
+#if !MOBILE
+
                void _ConstructorInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -107,6 +112,7 @@ namespace System.Reflection {
                {
                        return this.Invoke (parameters);
                }
+#endif
 
 #if NET_4_0
                public override bool Equals (object obj)

diff --git a/mcs/class/corlib/System.Reflection/EventInfo.cs b/mcs/class/corlib/System.Reflection/EventInfo.cs
index f2f69b7707eb5f3f687540b069df9dc6f70f3b55..9db81dc0cb2482faa9b49a4bbcc2c185eb97d4ed 100644 (file)
--- a/mcs/class/corlib/System.Reflection/EventInfo.cs
+++ b/mcs/class/corlib/System.Reflection/EventInfo.cs
@@ -37,7 +37,11 @@ namespace System.Reflection {
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
+#if MOBILE
+       public abstract class EventInfo : MemberInfo {
+#else
        public abstract class EventInfo : MemberInfo, _EventInfo {
+#endif
                AddEventAdapter cached_add_event;
 
                public abstract EventAttributes Attributes {get;}
@@ -180,6 +184,7 @@ namespace System.Reflection {
                }
 #endif
 
+#if !MOBILE
                void _EventInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -205,6 +210,7 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
 
                delegate void AddEventAdapter (object _this, Delegate dele);
 

diff --git a/mcs/class/corlib/System.Reflection/FieldInfo.cs b/mcs/class/corlib/System.Reflection/FieldInfo.cs
index ee62a4ec048b683263b1e3011d29b184e94606bd..06ea3e8e70cd8c01e2d8475819928bceb9bdd9ac 100644 (file)
--- a/mcs/class/corlib/System.Reflection/FieldInfo.cs
+++ b/mcs/class/corlib/System.Reflection/FieldInfo.cs
@@ -38,8 +38,11 @@ namespace System.Reflection {
        [ComDefaultInterfaceAttribute (typeof (_FieldInfo))]
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
+#if MOBILE
+       public abstract class FieldInfo : MemberInfo {
+#else
        public abstract class FieldInfo : MemberInfo, _FieldInfo {
-
+#endif
                public abstract FieldAttributes Attributes {get;}
                public abstract RuntimeFieldHandle FieldHandle {get;}
 
@@ -291,6 +294,8 @@ namespace System.Reflection {
                        }
                }
 #endif
+
+#if !MOBILE
                void _FieldInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -316,5 +321,6 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System.Reflection/MemberInfo.cs b/mcs/class/corlib/System.Reflection/MemberInfo.cs
index 59bb449aef21f364538e29d8e10079f1e98b798a..463c9114a87f3813fdc775edb962d28dcb1f076a 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MemberInfo.cs
+++ b/mcs/class/corlib/System.Reflection/MemberInfo.cs
@@ -39,7 +39,11 @@ namespace System.Reflection {
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
        [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
+#if MOBILE
+       public abstract class MemberInfo : ICustomAttributeProvider {
+#else
        public abstract class MemberInfo : ICustomAttributeProvider, _MemberInfo {
+#endif
 
                protected MemberInfo ()
                {
@@ -112,6 +116,7 @@ namespace System.Reflection {
                }
 #endif
 
+#if !MOBILE
                void _MemberInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -137,5 +142,6 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System.Reflection/MethodBase.cs b/mcs/class/corlib/System.Reflection/MethodBase.cs
index 671f11d00575eea9ec8bbac54ade2ebf17782b79..68491679ab2a5e70806d433b49f75e1b697290b7 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MethodBase.cs
+++ b/mcs/class/corlib/System.Reflection/MethodBase.cs
@@ -42,8 +42,11 @@ namespace System.Reflection {
        [ComDefaultInterfaceAttribute (typeof (_MethodBase))]
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
+#if MOBILE
+       public abstract class MethodBase: MemberInfo {
+#else
        public abstract class MethodBase: MemberInfo, _MethodBase {
-
+#endif
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                public extern static MethodBase GetCurrentMethod ();
 
@@ -277,6 +280,7 @@ namespace System.Reflection {
                }
 #endif
 
+#if !MOBILE
                void _MethodBase.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -302,5 +306,6 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System.Reflection/MethodInfo.cs b/mcs/class/corlib/System.Reflection/MethodInfo.cs
index 3829cf5e0e83652193baea47ed7d6ae4b1e6ca7e..69cf68c0743378f6da16dc528184560b27c9c264 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MethodInfo.cs
+++ b/mcs/class/corlib/System.Reflection/MethodInfo.cs
@@ -37,8 +37,11 @@ namespace System.Reflection {
        [ComDefaultInterfaceAttribute (typeof (_MethodInfo))]
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
+#if MOBILE
+       public abstract class MethodInfo: MethodBase {
+#else
        public abstract class MethodInfo: MethodBase, _MethodInfo {
-
+#endif
                public abstract MethodInfo GetBaseDefinition();
 
                internal virtual MethodInfo GetBaseMethod ()
@@ -58,6 +61,7 @@ namespace System.Reflection {
 
                public abstract ICustomAttributeProvider ReturnTypeCustomAttributes { get; }
 
+#if !MOBILE
                void _MethodInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -83,6 +87,7 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
 
                [ComVisible (true)]
                public virtual MethodInfo GetGenericMethodDefinition ()

diff --git a/mcs/class/corlib/System.Reflection/Module.cs b/mcs/class/corlib/System.Reflection/Module.cs
index 0fdf9d7d255f745607794c0e57aa25fcbb4e3daa..a2bfae1dfbe6f031bf40c3812bd580f1be3454f1 100644 (file)
--- a/mcs/class/corlib/System.Reflection/Module.cs
+++ b/mcs/class/corlib/System.Reflection/Module.cs
@@ -48,7 +48,9 @@ namespace System.Reflection {
        [Serializable]
        [ClassInterfaceAttribute (ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
-#if NET_4_0
+#if MOBILE
+       public abstract class Module : ISerializable, ICustomAttributeProvider {
+#elif NET_4_0
        public abstract class Module : ISerializable, ICustomAttributeProvider, _Module {
 #else
        public partial class Module : ISerializable, ICustomAttributeProvider, _Module {
@@ -263,6 +265,7 @@ namespace System.Reflection {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                internal static extern void GetPEKind (IntPtr module, out PortableExecutableKinds peKind, out ImageFileMachine machine);
 
+#if !MOBILE
                void _Module.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -283,6 +286,7 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
 
 #if NET_4_0
                public override bool Equals (object o)

diff --git a/mcs/class/corlib/System.Reflection/ParameterInfo.cs b/mcs/class/corlib/System.Reflection/ParameterInfo.cs
index 1a37b2635dbc5e5e3e325efb503933297ceeb794..00bc627fd7cf036adea704554d27736b68cf6eb3 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ParameterInfo.cs
+++ b/mcs/class/corlib/System.Reflection/ParameterInfo.cs
@@ -39,7 +39,11 @@ namespace System.Reflection
        [Serializable]
        [ClassInterfaceAttribute (ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
+#if MOBILE
+       public class ParameterInfo : ICustomAttributeProvider {
+#else
        public class ParameterInfo : ICustomAttributeProvider, _ParameterInfo {
+#endif
 
                protected Type ClassImpl;
                protected object DefaultValueImpl;
@@ -282,6 +286,7 @@ namespace System.Reflection
                }
 #endif
 
+#if !MOBILE
                void _ParameterInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -302,5 +307,7 @@ namespace System.Reflection
                {
                        throw new NotImplementedException ();
                }
+#endif
+
        }
 }

diff --git a/mcs/class/corlib/System.Reflection/PropertyInfo.cs b/mcs/class/corlib/System.Reflection/PropertyInfo.cs
index 90c8957959693f2a3500468dab9f8185afaf8f17..6675d2e6c69f7bdbbf18d71b2393815e6458b947 100644 (file)
--- a/mcs/class/corlib/System.Reflection/PropertyInfo.cs
+++ b/mcs/class/corlib/System.Reflection/PropertyInfo.cs
@@ -38,8 +38,11 @@ namespace System.Reflection {
        [ComDefaultInterfaceAttribute (typeof (_PropertyInfo))]
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
+#if MOBILE
+       public abstract class PropertyInfo : MemberInfo {
+#else
        public abstract class PropertyInfo : MemberInfo, _PropertyInfo {
-
+#endif
                public abstract PropertyAttributes Attributes { get; }
                public abstract bool CanRead { get; }
                public abstract bool CanWrite { get; }
@@ -174,6 +177,7 @@ namespace System.Reflection {
                }
 #endif
 
+#if !MOBILE
                void _PropertyInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -199,5 +203,6 @@ namespace System.Reflection {
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
index 50bf43c0b893895a8a87adef4ab61971d2682a36..7eee46b0314e36444522da272c44032a6bb81386 100644 (file)
--- a/mcs/class/corlib/System.Threading/Thread.cs
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -122,7 +122,11 @@ namespace System.Threading {
        [ComVisible (true)]
        [ComDefaultInterface (typeof (_Thread))]
        [StructLayout (LayoutKind.Sequential)]
+#if MOBILE
+       public sealed class Thread : CriticalFinalizerObject {
+#else
        public sealed class Thread : CriticalFinalizerObject, _Thread {
+#endif
 #pragma warning disable 414            
                #region Sync with metadata/object-internals.h
                private InternalThread internal_thread;
@@ -1008,6 +1012,7 @@ namespace System.Threading {
                        ExecutionContext.SecurityContext.CompressedStack = stack;
                }
 
+#if !MOBILE
                void _Thread.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -1028,5 +1033,6 @@ namespace System.Threading {
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System/AppDomain.cs b/mcs/class/corlib/System/AppDomain.cs
index cd07f47d23cb03d15217df6d8012fa6ab9ed85a1..9b950b31176a1d0120905998e382c5a5267158a7 100644 (file)
--- a/mcs/class/corlib/System/AppDomain.cs
+++ b/mcs/class/corlib/System/AppDomain.cs
@@ -59,13 +59,13 @@ using System.Text;
 namespace System {
 
        [ComVisible (true)]
-#if !NET_2_1
+#if !MOBILE
        [ComDefaultInterface (typeof (_AppDomain))]
 #endif
        [ClassInterface(ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
-#if NET_2_1
-       public sealed class AppDomain : MarshalByRefObject, _AppDomain {
+#if MOBILE
+       public sealed class AppDomain : MarshalByRefObject {
 #else
        public sealed class AppDomain : MarshalByRefObject, _AppDomain, IEvidenceFactory {
 #endif
@@ -1520,7 +1520,7 @@ namespace System {
                        return GetAssemblies (true);
                }
 
-#if !NET_2_1
+#if !MOBILE
                void _AppDomain.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();

diff --git a/mcs/class/corlib/System/Attribute.cs b/mcs/class/corlib/System/Attribute.cs
index 48f5a0f5662b67408ab9ff633f7c5e859769a5e8..46d0b775dbfb0c85f659f27446003e3a74dd569c 100644 (file)
--- a/mcs/class/corlib/System/Attribute.cs
+++ b/mcs/class/corlib/System/Attribute.cs
@@ -40,7 +40,11 @@ namespace System
        [ComVisible (true)]
        [ComDefaultInterface (typeof (_Attribute))]
        [ClassInterfaceAttribute (ClassInterfaceType.None)]
+#if MOBILE
+       public abstract class Attribute {
+#else
        public abstract class Attribute : _Attribute {
+#endif
                protected Attribute ()
                {
                }
@@ -420,6 +424,7 @@ namespace System
                        return ValueType.DefaultEquals (this, obj);
                }
 
+#if !MOBILE
                void _Attribute.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -440,5 +445,6 @@ namespace System
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }

diff --git a/mcs/class/corlib/System/Exception.cs b/mcs/class/corlib/System/Exception.cs
index 79a21aafde6ce76d44da7bd5766d529c1825656a..d5d81dcd73926ac2a74d7629de56fcbf51b79958 100644 (file)
--- a/mcs/class/corlib/System/Exception.cs
+++ b/mcs/class/corlib/System/Exception.cs
@@ -45,7 +45,11 @@ namespace System
        [ComDefaultInterface (typeof (_Exception))]
        [ClassInterface (ClassInterfaceType.None)]
        [StructLayout (LayoutKind.Sequential)]
+#if MOBILE
+       public class Exception : ISerializable
+#else
        public class Exception : ISerializable, _Exception
+#endif
        {
 #pragma warning disable 169, 649
                #region Sync with object-internals.h

diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs
index bca4e08ec99b27c6c02397a46db5bc77d2922934..90d39b20b30fe828bd14a1f79726025e5b2f0b4e 100644 (file)
--- a/mcs/class/corlib/System/Type.cs
+++ b/mcs/class/corlib/System/Type.cs
@@ -49,8 +49,12 @@ namespace System {
        [ComVisible (true)]
        [ComDefaultInterface (typeof (_Type))]
        [StructLayout (LayoutKind.Sequential)]
+#if MOBILE
+       public abstract class Type : MemberInfo, IReflect {
+#else
        public abstract class Type : MemberInfo, IReflect, _Type {
-               
+#endif
+
                internal RuntimeTypeHandle _impl;
 
                public static readonly char Delimiter = '.';
@@ -1673,6 +1677,7 @@ namespace System {
                        }
                }
 
+#if !MOBILE
                void _Type.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -1692,5 +1697,6 @@ namespace System {
                {
                        throw new NotImplementedException ();
                }
+#endif
        }
 }