From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Sat, 20 Jun 2020 03:54:16 +0000 (-0500)
Subject: Move COM ILLink.Descriptors entries to CoreCLR (#38172)
X-Git-Tag: submit/tizen/20210909.063632~7247
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=721bea238f445080e8f2ea209a7321af9226d7e6;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Move COM ILLink.Descriptors entries to CoreCLR (#38172)

These types only exist in CoreCLR, they don't exist in Mono.

Contributes to #36659
---

diff --git a/src/coreclr/src/System.Private.CoreLib/ILLinkTrim.xml b/src/coreclr/src/System.Private.CoreLib/ILLinkTrim.xml
index f24632d..11a67fd 100644
--- a/src/coreclr/src/System.Private.CoreLib/ILLinkTrim.xml
+++ b/src/coreclr/src/System.Private.CoreLib/ILLinkTrim.xml
@@ -9,5 +9,13 @@
     <type fullname="System.Diagnostics.Tracing.EventPipe*" />
     <!-- The private Event methods are accessed by private reflection in the base EventSource class. -->
     <type fullname="System.Diagnostics.Tracing.NativeRuntimeEventSource" />
+    <!-- Accessed via native code. -->
+    <type fullname="System.Runtime.InteropServices.ComTypes.IEnumerable" />
+    <type fullname="System.Runtime.InteropServices.ComTypes.IEnumerator" />
+    <type fullname="System.Runtime.InteropServices.CustomMarshalers.*" />
+    <!-- Workaround for https://github.com/mono/linker/issues/378 -->
+    <type fullname="System.Runtime.InteropServices.IDispatch" />
+    <type fullname="System.Runtime.InteropServices.IMarshal" />
+    <type fullname="Internal.Runtime.InteropServices.IClassFactory2" />
   </assembly>
 </linker>
diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
index 8072c02..aa0a42d 100644
--- a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
+++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
@@ -37,14 +37,6 @@
       <!-- Methods is used by VS Tasks Window. -->
       <method name="GetActiveTaskFromId" />
     </type>
-    <!-- Accessed via native code. -->
-    <type fullname="System.Runtime.InteropServices.ComTypes.IEnumerable" />
-    <type fullname="System.Runtime.InteropServices.ComTypes.IEnumerator" />
-    <type fullname="System.Runtime.InteropServices.CustomMarshalers.*" />
-    <!-- Workaround for https://github.com/mono/linker/issues/378 -->
-    <type fullname="System.Runtime.InteropServices.IDispatch" />
-    <type fullname="System.Runtime.InteropServices.IMarshal" />
-    <type fullname="Internal.Runtime.InteropServices.IClassFactory2" />
     <type fullname="System.Threading.ThreadPoolBoundHandle">
       <!-- Workaround to keep .interfaceimpl even though this type
              is not instantiated on unix: