CoreRT updates for files moved to shared partition

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

7 files changed, 65 insertions, 24 deletions

diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComImportAttribute.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComImportAttribute.cs
new file mode 100644
index 0000000000..a290bf4510
--- /dev/null
+++ b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComImportAttribute.cs
@@ -0,0 +1,11 @@
+// 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
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, Inherited = false)]
+    public sealed class ComImportAttribute : Attribute
+    {
+    }
+}
diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComInterfaceType.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComInterfaceType.cs
new file mode 100644
index 0000000000..03b8ae534a
--- /dev/null
+++ b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComInterfaceType.cs
@@ -0,0 +1,14 @@
+// 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
+{
+    public enum ComInterfaceType
+    {
+        InterfaceIsDual = 0,
+        InterfaceIsIUnknown = 1,
+        InterfaceIsIDispatch = 2,
+        InterfaceIsIInspectable = 3,
+    }
+}
diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IConnectionPoint.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IConnectionPoint.cs
index fcca685ad8..b2ce1928a1 100644
--- a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IConnectionPoint.cs
+++ b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IConnectionPoint.cs
@@ -5,7 +5,7 @@
 namespace System.Runtime.InteropServices.ComTypes
 {
     [Guid("B196B286-BAB4-101A-B69C-00AA00341D07")]
-    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
     [ComImport]
     public interface IConnectionPoint
     {
diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IEnumerable.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IEnumerable.cs
deleted file mode 100644
index e541960cae..0000000000
--- a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/IEnumerable.cs
+++ /dev/null
@@ -1,22 +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
-
-using System;
-namespace System.Runtime.InteropServices.ComTypes
-{
-    /*==========================================================================
-    ** Interface: IEnumerable
-    ** Purpose:
-    ** This interface is redefined here since the original IEnumerable interface
-    ** has all its methods marked as ecall's since it is a managed standard
-    ** interface. This interface is used from within the runtime to make a call
-    ** on the COM server directly when it implements the IEnumerable interface.
-    ==========================================================================*/
-    [Guid("496B0ABE-CDEE-11d3-88E8-00902754C43A")]
-    internal interface IEnumerable
-    {
-        [DispId(-4)]
-        System.Collections.IEnumerator GetEnumerator();
-    }
-}
diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/ITypeLib2.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/ITypeLib2.cs
index 76ff8a9be5..61703d1cfe 100644
--- a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/ITypeLib2.cs
+++ b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/ComTypes/ITypeLib2.cs
@@ -23,7 +23,7 @@ namespace System.Runtime.InteropServices.ComTypes
         [PreserveSig]
         new void ReleaseTLibAttr(IntPtr pTLibAttr);
         void GetCustData(ref Guid guid, out object pVarVal);
-        [LCIDConversionAttribute(1)]
+        [LCIDConversion(1)]
         void GetDocumentation2(int index, out string pbstrHelpString, out int pdwHelpStringContext, out string pbstrHelpStringDll);
         void GetLibStatistics(IntPtr pcUniqueNames, out int pcchUniqueNames);
         void GetAllCustData(IntPtr pCustData);
diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/InterfaceTypeAttribute.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/InterfaceTypeAttribute.cs
new file mode 100644
index 0000000000..695faa7937
--- /dev/null
+++ b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/InterfaceTypeAttribute.cs
@@ -0,0 +1,21 @@
+// 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
+{
+    [AttributeUsage(AttributeTargets.Interface, Inherited = false)]
+    public sealed class InterfaceTypeAttribute : Attribute
+    {
+        public InterfaceTypeAttribute(ComInterfaceType interfaceType)
+        {
+            Value = interfaceType;
+        }
+        public InterfaceTypeAttribute(short interfaceType)
+        {
+            Value = (ComInterfaceType)interfaceType;
+        }
+
+        public ComInterfaceType Value { get; }
+    }
+}
diff --git a/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/LCIDConversionAttribute.cs b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/LCIDConversionAttribute.cs
new file mode 100644
index 0000000000..75f8fcfc91
--- /dev/null
+++ b/src/System.Private.CoreLib/shared/System/Runtime/InteropServices/LCIDConversionAttribute.cs
@@ -0,0 +1,17 @@
+// 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
+{
+    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
+    public sealed class LCIDConversionAttribute : Attribute
+    {
+        public LCIDConversionAttribute(int lcid)
+        {
+            Value = lcid;
+        }
+
+        public int Value { get; }
+    }
+}