Change System.Object to ClassInterface.None

Prevents .NET Framework legacy interfaces from leaking out. Fixes https://github.com/dotnet/corefx/issues/33638
dotnet · Nov 21, 2018 · d2749f1 · d2749f1
1 parent 0197d4e
commit d2749f1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/src/System.Private.CoreLib/src/System/Delegate.cs b/src/System.Private.CoreLib/src/System/Delegate.cs
@@ -2,20 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+
 namespace System
 {
-    using System;
-    using System.Reflection;
-    using System.Runtime;
-    using System.Threading;
-    using System.Runtime.Serialization;
-    using System.Runtime.InteropServices;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.Versioning;
-    using System.Diagnostics;
-
-    [ClassInterface(ClassInterfaceType.AutoDual)]
-    [System.Runtime.InteropServices.ComVisible(true)]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ComVisible(true)]
     public abstract class Delegate : ICloneable, ISerializable
     {
         // _target is the object we will invoke on

diff --git a/src/System.Private.CoreLib/src/System/MulticastDelegate.cs b/src/System.Private.CoreLib/src/System/MulticastDelegate.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Reflection;
-using System.Runtime.Serialization;
 using System.Diagnostics;
+using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.Serialization;
+
 using Internal.Runtime.CompilerServices;
 
 namespace System

diff --git a/src/System.Private.CoreLib/src/System/Object.cs b/src/System.Private.CoreLib/src/System/Object.cs
@@ -32,8 +32,8 @@ namespace System
     // 
     //This class contains no data and does not need to be serializable 
     [Serializable]
-    [ClassInterface(ClassInterfaceType.AutoDual)]
-    [System.Runtime.InteropServices.ComVisible(true)]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ComVisible(true)]
     [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
     public class Object
     {
@@ -200,8 +200,8 @@ private FieldInfo GetFieldInfo(string typeName, string fieldName)
     // The name "__Canon" will never been seen by users but it will appear a lot in debugger stack traces
     // involving generics so it is kept deliberately short as to avoid being a nuisance.
 
-    [ClassInterface(ClassInterfaceType.AutoDual)]
-    [System.Runtime.InteropServices.ComVisible(true)]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ComVisible(true)]
     internal class __Canon
     {
     }