Delete remaining legacy ComInterfaces (dotnet/coreclr#9270)

Commit migrated from https://github.com/dotnet/coreclr/commit/e32f3bece919c1bc77979809d52e202bc6fbdb1a

diff --git a/src/coreclr/src/mscorlib/model.xml b/src/coreclr/src/mscorlib/model.xml
index dce2b0a..a45ac46 100644 (file)
--- a/src/coreclr/src/mscorlib/model.xml
+++ b/src/coreclr/src/mscorlib/model.xml
@@ -80,10 +80,6 @@
       <Member Name="CreateInstanceFrom(System.String,System.String)" />
       <Member Name="CreateInstanceFrom(System.String,System.String,System.Boolean,System.Reflection.BindingFlags,System.Reflection.Binder,System.Object[],System.Globalization.CultureInfo,System.Object[])" />
       <Member Name="CreateInstanceFrom(System.String,System.String,System.Object[])" />
-      <Member Status="ImplRoot" Name="System.Runtime.InteropServices._Activator.GetIDsOfNames(System.Guid@,System.IntPtr,System.UInt32,System.UInt32,System.IntPtr)" />
-      <Member Status="ImplRoot" Name="System.Runtime.InteropServices._Activator.GetTypeInfo(System.UInt32,System.UInt32,System.IntPtr)" />
-      <Member Status="ImplRoot" Name="System.Runtime.InteropServices._Activator.GetTypeInfoCount(System.UInt32@)" />
-      <Member Status="ImplRoot" Name="System.Runtime.InteropServices._Activator.Invoke(System.UInt32,System.Guid@,System.UInt32,System.Int16,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr)" />
     </Type>
     <Type Status="ImplRoot" Name="System.AppDomain">
       <Member Status="ImplRoot" Name="get_CurrentDomain" />

diff --git a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props
index d2b3caf..5c51e47 100644 (file)
--- a/src/coreclr/src/mscorlib/mscorlib.shared.sources.props
+++ b/src/coreclr/src/mscorlib/mscorlib.shared.sources.props
@@ -263,7 +263,6 @@
     <SystemSources Include="$(BclSourcesRoot)\System\AppDomainSetup.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\AppDomainManager.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\IAppDomainPauseManager.cs" />
-    <SystemSources Include="$(BclSourcesRoot)\System\IAppDomain.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\AppDomainAttributes.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\AppDomainUnloadedException.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\ApplicationId.cs" />
@@ -288,7 +287,6 @@
     <SystemSources Include="$(BclSourcesRoot)\System\CfgParser.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\CLSCompliantAttribute.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\TypeUnloadedException.cs" />
-    <SystemSources Include="$(BclSourcesRoot)\System\cominterfaces.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\CompatibilitySwitches.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\LowLevelConsole.cs" />
     <SystemSources Include="$(BclSourcesRoot)\System\ContextMarshalException.cs" />
@@ -437,7 +435,6 @@
     <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\Binder.cs" />
     <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\BindingFlags.cs" />
     <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\CallingConventions.cs" />
-    <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\ComInterfaces.cs" />
     <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\ConstructorInfo.cs" />
     <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\CustomAttribute.cs" />
     <ReflectionSources Include="$(BclSourcesRoot)\System\Reflection\DefaultMemberAttribute.cs" />
@@ -493,7 +490,6 @@
     <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\AssemblyBuilderData.cs" />
     <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\AssemblyBuilderAccess.cs" />
     <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\AQNBuilder.cs" />
-    <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\ComInterfaces.cs" />
     <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\ConstructorBuilder.cs" />
     <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\DynamicILGenerator.cs" />
     <ReflectionEmitSources Include="$(BclSourcesRoot)\System\Reflection\Emit\DynamicMethod.cs" />

diff --git a/src/coreclr/src/mscorlib/src/System/Activator.cs b/src/coreclr/src/mscorlib/src/System/Activator.cs
index 6fad8f3..769e4cb 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Activator.cs
+++ b/src/coreclr/src/mscorlib/src/System/Activator.cs
@@ -28,10 +28,7 @@ namespace System {
     using System.Diagnostics.Contracts;
 
     // Only statics, does not need to be marked with the serializable attribute
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_Activator))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class Activator : _Activator
+    public sealed class Activator
     {
         internal const int LookupMask                 = 0x000000FF;
         internal const BindingFlags ConLookup         = (BindingFlags) (BindingFlags.Instance | BindingFlags.Public);
@@ -553,28 +550,6 @@ namespace System {
         private static void Log(bool test, string title, string success, string failure)
         {
         }
-
-        void _Activator.GetTypeInfoCount(out uint pcTInfo)
-        {
-            throw new NotImplementedException();
-        }
-
-        void _Activator.GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo)
-        {
-            throw new NotImplementedException();
-        }
-
-        void _Activator.GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
-        {
-            throw new NotImplementedException();
-        }
-
-        // If you implement this method, make sure to include _Activator.Invoke in VM\DangerousAPIs.h and
-        // include _Activator in SystemDomain::IsReflectionInvocationMethod in AppDomain.cpp.
-        void _Activator.Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr)
-        {
-            throw new NotImplementedException();
-        }
     }
 }
 

diff --git a/src/coreclr/src/mscorlib/src/System/AppDomain.cs b/src/coreclr/src/mscorlib/src/System/AppDomain.cs
index 8410456..3aeb465 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/AppDomain.cs
+++ b/src/coreclr/src/mscorlib/src/System/AppDomain.cs
@@ -176,11 +176,7 @@ namespace System
     }
 
 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(System._AppDomain))]
-    [ComVisible(true)]
-    public sealed class AppDomain :
-        _AppDomain, IEvidenceFactory
+    public sealed class AppDomain : IEvidenceFactory
     {
         // Domain security information
         // These fields initialized from the other side only. (NOTE: order 

diff --git a/src/coreclr/src/mscorlib/src/System/Attribute.cs b/src/coreclr/src/mscorlib/src/System/Attribute.cs
index e77450e..796608a 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Attribute.cs
+++ b/src/coreclr/src/mscorlib/src/System/Attribute.cs
@@ -17,10 +17,7 @@ namespace System {
 
     [Serializable]
     [AttributeUsageAttribute(AttributeTargets.All, Inherited = true, AllowMultiple=false)] 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_Attribute))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class Attribute : _Attribute
+    public abstract class Attribute
     {
         #region Private Statics
 

diff --git a/src/coreclr/src/mscorlib/src/System/IAppDomain.cs b/src/coreclr/src/mscorlib/src/System/IAppDomain.cs
deleted file mode 100644 (file)
index cdb8316..0000000
--- a/src/coreclr/src/mscorlib/src/System/IAppDomain.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*============================================================
-**
-** Interface:  IAppDomain
-** 
-** 
-**
-**
-** Purpose: Properties and methods exposed to COM
-**
-** 
-===========================================================*/
-namespace System
-{
-    using System.Runtime.InteropServices;
-
-    [GuidAttribute("05F696DC-2B29-3663-AD8B-C4389CF2A713")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _AppDomain
-    {
-    }
-}
-

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Assembly.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Assembly.cs
index 22b47c5..cfa8da1 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Assembly.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Assembly.cs
@@ -40,15 +40,11 @@ namespace System.Reflection
     using System.Runtime.Loader;
 
     [Serializable]
-    [System.Runtime.InteropServices.ComVisible(true)]
     public delegate Module ModuleResolveEventHandler(Object sender, ResolveEventArgs e);
 
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_Assembly))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class Assembly : _Assembly, IEvidenceFactory, ICustomAttributeProvider, ISerializable
+    public abstract class Assembly : IEvidenceFactory, ICustomAttributeProvider, ISerializable
     {
         protected Assembly() {}
 
@@ -664,9 +660,6 @@ namespace System.Reflection
             throw new NotImplementedException();
         }
 
-        // To not break compatibility with the V1 _Assembly interface we need to make this
-        // new member ComVisible(false).
-        [ComVisible(false)]
         public virtual bool ReflectionOnly
         {
             get
@@ -816,9 +809,6 @@ namespace System.Reflection
             }
         }
 
-        // To not break compatibility with the V1 _Assembly interface we need to make this
-        // new member ComVisible(false).
-        [ComVisible(false)]
         public virtual String ImageRuntimeVersion
         {
             get
@@ -1402,9 +1392,6 @@ namespace System.Reflection
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         private static extern bool IsReflectionOnly(RuntimeAssembly assembly);
 
-        // To not break compatibility with the V1 _Assembly interface we need to make this
-        // new member ComVisible(false).
-        [ComVisible(false)]
         public override bool ReflectionOnly
         {
             get
@@ -1583,9 +1570,6 @@ namespace System.Reflection
         [SuppressUnmanagedCodeSecurity]
         private extern static void GetImageRuntimeVersion(RuntimeAssembly assembly, StringHandleOnStack retString);
 
-        // To not break compatibility with the V1 _Assembly interface we need to make this
-        // new member ComVisible(false).
-        [ComVisible(false)]
         public override String ImageRuntimeVersion
         {
             get{

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/AssemblyName.cs b/src/coreclr/src/mscorlib/src/System/Reflection/AssemblyName.cs
index 48eab33..93f8022 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/AssemblyName.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/AssemblyName.cs
@@ -27,10 +27,7 @@ namespace System.Reflection {
     using System.Text;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_AssemblyName))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class AssemblyName : _AssemblyName, ICloneable, ISerializable, IDeserializationCallback
+    public sealed class AssemblyName : ICloneable, ISerializable, IDeserializationCallback
     {
         //
         // READ ME

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/ComInterfaces.cs b/src/coreclr/src/mscorlib/src/System/Reflection/ComInterfaces.cs
deleted file mode 100644 (file)
index 6e4b0cc..0000000
--- a/src/coreclr/src/mscorlib/src/System/Reflection/ComInterfaces.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System.Runtime.InteropServices
-{
-    [GuidAttribute("BCA8B44D-AAD6-3A86-8AB7-03349F4F2DA2")]
-    [CLSCompliant(false)]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [TypeLibImportClassAttribute(typeof(System.Type))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _Type
-    {
-    }
-
-    [GuidAttribute("17156360-2f1a-384a-bc52-fde93c215c5b")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsDual)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Assembly))]
-    [CLSCompliant(false)]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _Assembly
-    {
-    }
-
-    [GuidAttribute("f7102fa9-cabb-3a74-a6da-b4567ef1b079")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.MemberInfo))]
-    [CLSCompliant(false)]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _MemberInfo
-    {
-    }
-
-    [GuidAttribute("6240837A-707F-3181-8E98-A36AE086766B")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.MethodBase))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _MethodBase
-    {
-    }
-
-    [GuidAttribute("FFCC1B5D-ECB8-38DD-9B01-3DC8ABC2AA5F")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.MethodInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _MethodInfo
-    {
-    }
-
-    [GuidAttribute("E9A19478-9646-3679-9B10-8411AE1FD57D")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.ConstructorInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _ConstructorInfo
-    {
-    }
-
-    [GuidAttribute("8A7C1442-A9FB-366B-80D8-4939FFA6DBE0")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.FieldInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _FieldInfo
-    {
-    }
-
-    [GuidAttribute("F59ED4E4-E68F-3218-BD77-061AA82824BF")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.PropertyInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _PropertyInfo
-    {
-    }
-
-    [GuidAttribute("9DE59C64-D889-35A1-B897-587D74469E5B")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.EventInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _EventInfo
-    {
-    }
-
-    [GuidAttribute("993634C4-E47A-32CC-BE08-85F567DC27D6")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.ParameterInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _ParameterInfo
-    {
-    }
-
-    [GuidAttribute("D002E9BA-D9E3-3749-B1D3-D565A08B13E7")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Module))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _Module
-    {
-    }
-
-    [GuidAttribute("B42B6AAC-317E-34D5-9FA9-093BB4160C50")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.AssemblyName))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _AssemblyName
-    {
-    }
-}
-

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/ConstructorInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/ConstructorInfo.cs
index 3d927fc..c5549d0 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/ConstructorInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/ConstructorInfo.cs
@@ -23,10 +23,7 @@ namespace System.Reflection
     using System.Runtime.CompilerServices;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_ConstructorInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class ConstructorInfo : MethodBase, _ConstructorInfo
+    public abstract class ConstructorInfo : MethodBase
     {
         #region Static Members
         [System.Runtime.InteropServices.ComVisible(true)]

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
index 9520015..34b657f 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/AssemblyBuilder.cs
@@ -156,10 +156,7 @@ namespace System.Reflection.Emit
 
     // AssemblyBuilder class.
     // deliberately not [serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_AssemblyBuilder))]
-    [ComVisible(true)]
-    public sealed class AssemblyBuilder : Assembly, _AssemblyBuilder
+    public sealed class AssemblyBuilder : Assembly
     {
         #region FCALL
         [MethodImplAttribute(MethodImplOptions.InternalCall)]

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs
deleted file mode 100644 (file)
index daa0e23..0000000
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ComInterfaces.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System.Runtime.InteropServices
-{
-    [GuidAttribute("BEBB2505-8B54-3443-AEAD-142A16DD9CC7")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.AssemblyBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _AssemblyBuilder
-    {
-    }
-
-    [GuidAttribute("ED3E4384-D7E2-3FA7-8FFD-8940D330519A")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.ConstructorBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _ConstructorBuilder
-    {
-    }
-
-    [GuidAttribute("BE9ACCE8-AAFF-3B91-81AE-8211663F5CAD")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.CustomAttributeBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _CustomAttributeBuilder
-    {
-    }
-
-    [GuidAttribute("C7BD73DE-9F85-3290-88EE-090B8BDFE2DF")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.EnumBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _EnumBuilder
-    {
-    }
-
-    [GuidAttribute("AADABA99-895D-3D65-9760-B1F12621FAE8")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.EventBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _EventBuilder
-    {
-    }
-
-    [GuidAttribute("CE1A3BF5-975E-30CC-97C9-1EF70F8F3993")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.FieldBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _FieldBuilder
-    {
-    }
-
-    [GuidAttribute("A4924B27-6E3B-37F7-9B83-A4501955E6A7")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.ILGenerator))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _ILGenerator
-    {
-    }
-
-    [GuidAttribute("4E6350D1-A08B-3DEC-9A3E-C465F9AEEC0C")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.LocalBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _LocalBuilder
-    {
-    }
-
-    [GuidAttribute("007D8A14-FDF3-363E-9A0B-FEC0618260A2")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.MethodBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _MethodBuilder
-    {
-    }
-
-
-    [GuidAttribute("D05FFA9A-04AF-3519-8EE1-8D93AD73430B")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.ModuleBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _ModuleBuilder
-    {
-    }
-
-    [GuidAttribute("36329EBA-F97A-3565-BC07-0ED5C6EF19FC")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.ParameterBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _ParameterBuilder
-    {
-    }
-
-    [GuidAttribute("15F9A479-9397-3A63-ACBD-F51977FB0F02")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.PropertyBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _PropertyBuilder
-    {
-    }
-
-    [GuidAttribute("7D13DD37-5A04-393C-BBCA-A5FEA802893D")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.SignatureHelper))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _SignatureHelper
-    {
-    }
-
-    [GuidAttribute("7E5678EE-48B3-3F83-B076-C58543498A58")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Reflection.Emit.TypeBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _TypeBuilder
-    {
-    }
-}

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ConstructorBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ConstructorBuilder.cs
index ef76adc..3e1f348 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ConstructorBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ConstructorBuilder.cs
@@ -16,10 +16,7 @@ namespace System.Reflection.Emit
     using System.Runtime.InteropServices;
     using System.Diagnostics.Contracts;
     
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_ConstructorBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class ConstructorBuilder : ConstructorInfo, _ConstructorBuilder
+    public sealed class ConstructorBuilder : ConstructorInfo
     { 
         private readonly MethodBuilder m_methodBuilder;
         internal bool m_isDefaultConstructor;

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/CustomAttributeBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/CustomAttributeBuilder.cs
index 545657a..c40a31d 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/CustomAttributeBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/CustomAttributeBuilder.cs
@@ -25,10 +25,7 @@ namespace System.Reflection.Emit {
     using System.Diagnostics;
     using System.Diagnostics.Contracts;
     
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_CustomAttributeBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public class CustomAttributeBuilder : _CustomAttributeBuilder
+    public class CustomAttributeBuilder
     {
         // public constructor to form the custom attribute with constructor and constructor
         // parameters.

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EnumBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EnumBuilder.cs
index 82dc282..19bcf6f 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EnumBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EnumBuilder.cs
@@ -22,11 +22,7 @@ namespace System.Reflection.Emit {
     using CultureInfo = System.Globalization.CultureInfo;
     using System.Security.Permissions;
 
-    
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_EnumBuilder))]
-[System.Runtime.InteropServices.ComVisible(true)]
-    sealed public class EnumBuilder : TypeInfo, _EnumBuilder
+    sealed public class EnumBuilder : TypeInfo
     {
         public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo){
             if(typeInfo==null) return false;

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EventBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EventBuilder.cs
index 449b208..6b81575 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EventBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/EventBuilder.cs
@@ -24,10 +24,7 @@ namespace System.Reflection.Emit {
     // A EventBuilder is always associated with a TypeBuilder.  The TypeBuilder.DefineEvent
     // method will return a new EventBuilder to a client.
     // 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_EventBuilder))]
-[System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class EventBuilder : _EventBuilder
+    public sealed class EventBuilder
     { 
     
         // Make a private constructor so these cannot be constructed externally.

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FieldBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FieldBuilder.cs
index 595d60a..415dc45 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FieldBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FieldBuilder.cs
@@ -13,10 +13,7 @@ namespace System.Reflection.Emit
     using System.Security.Permissions;
     using System.Diagnostics.Contracts;
     
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_FieldBuilder))]
-[System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class FieldBuilder : FieldInfo, _FieldBuilder
+    public sealed class FieldBuilder : FieldInfo
     {
         #region Private Data Members
         private int m_fieldTok;

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ILGenerator.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ILGenerator.cs
index b7d7e3f..284beb1 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ILGenerator.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ILGenerator.cs
@@ -15,10 +15,7 @@ namespace System.Reflection.Emit
     using System.Diagnostics;
     using System.Diagnostics.Contracts;
     
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_ILGenerator))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public class ILGenerator : _ILGenerator
+    public class ILGenerator
     {
         #region Const Members
         private const int defaultSize = 16;

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/LocalBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/LocalBuilder.cs
index a34d5eb..2db6e51 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/LocalBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/LocalBuilder.cs
@@ -9,10 +9,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Reflection.Emit 
 {
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_LocalBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class LocalBuilder : LocalVariableInfo, _LocalBuilder
+    public sealed class LocalBuilder : LocalVariableInfo
     { 
         #region Private Data Members
         private int m_localIndex;

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/MethodBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/MethodBuilder.cs
index 654e166..74fd9aa 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/MethodBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/MethodBuilder.cs
@@ -19,10 +19,7 @@ namespace System.Reflection.Emit
     using System.Diagnostics;
     using System.Diagnostics.Contracts;
 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_MethodBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class MethodBuilder : MethodInfo, _MethodBuilder
+    public sealed class MethodBuilder : MethodInfo
     {
         #region Private Data Members
         // Identity

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ModuleBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ModuleBuilder.cs
index 75320a1..399ca50 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ModuleBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ModuleBuilder.cs
@@ -50,10 +50,7 @@ namespace System.Reflection.Emit
     }
 
     // deliberately not [serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_ModuleBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public class ModuleBuilder : Module, _ModuleBuilder
+    public class ModuleBuilder : Module
     {
         #region FCalls
 

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ParameterBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ParameterBuilder.cs
index 7909562..0c10eb4 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ParameterBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/ParameterBuilder.cs
@@ -19,10 +19,7 @@ namespace System.Reflection.Emit {
     using System.Security.Permissions;
     using System.Diagnostics.Contracts;
 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_ParameterBuilder))]
-[System.Runtime.InteropServices.ComVisible(true)]
-    public class ParameterBuilder : _ParameterBuilder
+    public class ParameterBuilder
     {
         // set ParamMarshal
         [Obsolete("An alternate API is available: Emit the MarshalAs custom attribute instead. http://go.microsoft.com/fwlink/?linkid=14202")]

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/PropertyBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/PropertyBuilder.cs
index e7442b4..17cc1b9 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/PropertyBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/PropertyBuilder.cs
@@ -25,10 +25,7 @@ namespace System.Reflection.Emit {
     // A PropertyBuilder is always associated with a TypeBuilder.  The TypeBuilder.DefineProperty
     // method will return a new PropertyBuilder to a client.
     // 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_PropertyBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class PropertyBuilder : PropertyInfo, _PropertyBuilder
+    public sealed class PropertyBuilder : PropertyInfo
     { 
     
         // Make a private constructor so these cannot be constructed externally.

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/SignatureHelper.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/SignatureHelper.cs
index 5128576..b939cbb 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/SignatureHelper.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/SignatureHelper.cs
@@ -16,10 +16,7 @@ namespace System.Reflection.Emit
     using System.Runtime.Versioning;
     using System.Security.Permissions;
     
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_SignatureHelper))]
-[System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class SignatureHelper : _SignatureHelper
+    public sealed class SignatureHelper
     {
         #region Consts Fields
         private const int NO_SIZE_IN_SIG = -1;

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/TypeBuilder.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/TypeBuilder.cs
index 3680900..b0d968d 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/TypeBuilder.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/TypeBuilder.cs
@@ -35,10 +35,7 @@ namespace System.Reflection.Emit {
         Size128                     = 128,
     }
 
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_TypeBuilder))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class TypeBuilder : TypeInfo, _TypeBuilder
+    public sealed class TypeBuilder : TypeInfo
     {
         public override bool IsAssignableFrom(System.Reflection.TypeInfo typeInfo){
             if(typeInfo==null) return false;            

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/EventInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/EventInfo.cs
index 0eabb9d..1790b03 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/EventInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/EventInfo.cs
@@ -17,10 +17,7 @@ namespace System.Reflection
     using RuntimeTypeCache = System.RuntimeType.RuntimeTypeCache;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_EventInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class EventInfo : MemberInfo, _EventInfo
+    public abstract class EventInfo : MemberInfo
     {
         #region Constructor
         protected EventInfo() { }

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/FieldInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/FieldInfo.cs
index e61207a..2fe1537 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/FieldInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/FieldInfo.cs
@@ -21,10 +21,7 @@ namespace System.Reflection
     using RuntimeTypeCache = System.RuntimeType.RuntimeTypeCache;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_FieldInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class FieldInfo : MemberInfo, _FieldInfo
+    public abstract class FieldInfo : MemberInfo
     {
         #region Static Members
         public static FieldInfo GetFieldFromHandle(RuntimeFieldHandle handle)

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/MemberInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/MemberInfo.cs
index 96a89ad..3466ed2 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/MemberInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/MemberInfo.cs
@@ -14,10 +14,7 @@ namespace System.Reflection
     using System.Security.Permissions;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_MemberInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class MemberInfo : ICustomAttributeProvider, _MemberInfo
+    public abstract class MemberInfo : ICustomAttributeProvider
     {
         #region Constructor
         protected MemberInfo() { }

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/MethodBase.cs b/src/coreclr/src/mscorlib/src/System/Reflection/MethodBase.cs
index 8c77411..fe2ab71 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/MethodBase.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/MethodBase.cs
@@ -48,10 +48,7 @@ namespace System.Reflection
     }
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_MethodBase))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class MethodBase : MemberInfo, _MethodBase
+    public abstract class MethodBase : MemberInfo
     {
         #region Static Members
         public static MethodBase GetMethodFromHandle(RuntimeMethodHandle handle)

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/MethodInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/MethodInfo.cs
index 39387b1..14c0378 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/MethodInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/MethodInfo.cs
@@ -24,10 +24,7 @@ namespace System.Reflection
     using System.Runtime.CompilerServices;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_MethodInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class MethodInfo : MethodBase, _MethodInfo
+    public abstract class MethodInfo : MethodBase
     {
         #region Constructor
         protected MethodInfo() { }

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Module.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Module.cs
index b6be38e..c8e7ccb 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Module.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Module.cs
@@ -56,10 +56,7 @@ namespace System.Reflection
     }
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_Module))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class Module : _Module, ISerializable, ICustomAttributeProvider
+    public abstract class Module : ISerializable, ICustomAttributeProvider
     {   
         #region Static Constructor
         static Module()

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/ParameterInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/ParameterInfo.cs
index 6592e5a..107dedc 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/ParameterInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/ParameterInfo.cs
@@ -18,10 +18,7 @@ namespace System.Reflection
     using MdToken = System.Reflection.MetadataToken;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_ParameterInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public class ParameterInfo : _ParameterInfo, ICustomAttributeProvider, IObjectReference
+    public class ParameterInfo : ICustomAttributeProvider, IObjectReference
     {
         #region Legacy Protected Members
         protected String NameImpl; 

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/PropertyInfo.cs b/src/coreclr/src/mscorlib/src/System/Reflection/PropertyInfo.cs
index e31b378..330396c 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/PropertyInfo.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/PropertyInfo.cs
@@ -20,10 +20,7 @@ namespace System.Reflection
     using RuntimeTypeCache = System.RuntimeType.RuntimeTypeCache;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_PropertyInfo))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class PropertyInfo : MemberInfo, _PropertyInfo
+    public abstract class PropertyInfo : MemberInfo
     {
         #region Constructor
         protected PropertyInfo() { }

diff --git a/src/coreclr/src/mscorlib/src/System/Threading/Thread.cs b/src/coreclr/src/mscorlib/src/System/Threading/Thread.cs
index 8370b74..8a50f46 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Threading/Thread.cs
+++ b/src/coreclr/src/mscorlib/src/System/Threading/Thread.cs
@@ -103,11 +103,7 @@ namespace System.Threading {
         }
     }
 
-    // deliberately not [serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_Thread))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public sealed class Thread : RuntimeThread, _Thread
+    public sealed class Thread : RuntimeThread
     {
         /*=========================================================================
         ** Data accessed from managed code that needs to be defined in

diff --git a/src/coreclr/src/mscorlib/src/System/Type.cs b/src/coreclr/src/mscorlib/src/System/Type.cs
index 2b6e048..bced4d0 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Type.cs
+++ b/src/coreclr/src/mscorlib/src/System/Type.cs
@@ -29,10 +29,7 @@ namespace System
     using DebuggerStepThroughAttribute = System.Diagnostics.DebuggerStepThroughAttribute;
 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComDefaultInterface(typeof(_Type))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public abstract class Type : MemberInfo, _Type, IReflect
+    public abstract class Type : MemberInfo, IReflect
     {
         //
         // System.Type is appdomain agile type. Appdomain agile types cannot have precise static constructors. Make
@@ -300,7 +297,6 @@ namespace System
 
 
         // Module Property associated with a class.
-        // _Type.Module
         public new abstract Module Module { get; }
 
         // Assembly Property associated with a class.
@@ -1749,7 +1745,6 @@ namespace System
             return Equals(o as Type);
         }
 
-        // _Type.Equals(Type)
         [Pure]
         public virtual bool Equals(Type o)
         {
@@ -1787,7 +1782,6 @@ namespace System
         }
 
         // this method is required so Object.GetType is not made virtual by the compiler 
-        // _Type.GetType()
         public new Type GetType()
         {
             return base.GetType();

diff --git a/src/coreclr/src/mscorlib/src/System/cominterfaces.cs b/src/coreclr/src/mscorlib/src/System/cominterfaces.cs
deleted file mode 100644 (file)
index a83943d..0000000
--- a/src/coreclr/src/mscorlib/src/System/cominterfaces.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System.Runtime.InteropServices
-{
-    [GuidAttribute("03973551-57A1-3900-A2B5-9083E3FF2943")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Activator))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _Activator
-    {
-        void GetTypeInfoCount(out uint pcTInfo);
-
-        void GetTypeInfo(uint iTInfo, uint lcid, IntPtr ppTInfo);
-
-        void GetIDsOfNames([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId);
-
-        void Invoke(uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
-    }
-
-    [GuidAttribute("917B14D0-2D9E-38B8-92A9-381ACF52F7C0")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Attribute))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _Attribute
-    {
-    }
-
-    [GuidAttribute("C281C7F1-4AA9-3517-961A-463CFED57E75")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
-    [CLSCompliant(false)]
-    [TypeLibImportClassAttribute(typeof(System.Threading.Thread))]
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public interface _Thread
-    {
-    }
-}