From 80eece76a5d3e9c4a731633334cce37f6050b9e7 Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Thu, 28 Feb 2019 19:17:13 -0800 Subject: Move COM related attributes to the shared source location of Object class. (#22942) --- src/System.Private.CoreLib/shared/System/Object.cs | 3 +++ src/System.Private.CoreLib/src/System/Object.CoreCLR.cs | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/System.Private.CoreLib/shared/System/Object.cs b/src/System.Private.CoreLib/shared/System/Object.cs index 3319b2d15a..65e186ca49 100644 --- a/src/System.Private.CoreLib/shared/System/Object.cs +++ b/src/System.Private.CoreLib/shared/System/Object.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using System.Runtime.Versioning; namespace System @@ -13,6 +14,8 @@ namespace System // operations. // [Serializable] + [ClassInterface(ClassInterfaceType.AutoDispatch)] + [ComVisible(true)] [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] public partial class Object { diff --git a/src/System.Private.CoreLib/src/System/Object.CoreCLR.cs b/src/System.Private.CoreLib/src/System/Object.CoreCLR.cs index bbd498aaa5..fc361bcf20 100644 --- a/src/System.Private.CoreLib/src/System/Object.CoreCLR.cs +++ b/src/System.Private.CoreLib/src/System/Object.CoreCLR.cs @@ -3,12 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; namespace System { - [ClassInterface(ClassInterfaceType.AutoDispatch)] - [ComVisible(true)] public partial class Object { // Returns a Type object which represent this object instance. -- cgit v1.2.3