From 16a3ae1c97f548a3fca92fb49697b6e20482baf9 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Thu, 16 Dec 2021 15:52:49 +0100
Subject: [PATCH 1/3] Move coreclr specific ComponentActivator hosting
 dependency to coreclr

---
 .../src/ILLink/ILLink.Descriptors.Shared.xml              | 8 ++++++++
 .../src/ILLink/ILLink.Descriptors.Shared.xml              | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
index 1b4e3a1bd2acda..ce07141e483f5e 100644
--- a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
+++ b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
@@ -28,6 +28,14 @@
     <type fullname="Internal.Runtime.InteropServices.InMemoryAssemblyLoader">
       <method name="LoadInMemoryAssembly" />
     </type>
+
+    <!-- Native hosting accesses managed methods in the ComponentActivator class.
+         These are always rooted to ensure native calls get trimmer related errors
+         but will be trimmed away by the related feature switch -->
+    <type fullname="Internal.Runtime.InteropServices.ComponentActivator">
+      <method name="LoadAssemblyAndGetFunctionPointer" />
+      <method name="GetFunctionPointer" />
+    </type>
   </assembly>
 
   <!-- The private Event methods are accessed by private reflection in the base EventSource class. -->
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 0618f1644ea325..5f0f0d2d916a92 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
@@ -6,14 +6,6 @@
              https://github.com/mono/linker/pull/649 -->
       <method name=".ctor" />
     </type>
-
-    <!-- Native hosting accesses managed methods in the ComponentActivator class.
-         These are always rooted to ensure native calls get trimmer related errors
-         but will be trimmed away by the related feature switch -->
-    <type fullname="Internal.Runtime.InteropServices.ComponentActivator">
-      <method name="LoadAssemblyAndGetFunctionPointer" />
-      <method name="GetFunctionPointer" />
-    </type>
   </assembly>
   
   <!-- Properties and methods used by a debugger. -->

From 0a0132fc64b6fd75f472907ef701c21105b367ae Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 21 Dec 2021 18:03:28 +0100
Subject: [PATCH 2/3] Revert "Move coreclr specific ComponentActivator hosting
 dependency to coreclr"

This reverts commit 16a3ae1c97f548a3fca92fb49697b6e20482baf9.
---
 .../src/ILLink/ILLink.Descriptors.Shared.xml              | 8 --------
 .../src/ILLink/ILLink.Descriptors.Shared.xml              | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
index ce07141e483f5e..1b4e3a1bd2acda 100644
--- a/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
+++ b/src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
@@ -28,14 +28,6 @@
     <type fullname="Internal.Runtime.InteropServices.InMemoryAssemblyLoader">
       <method name="LoadInMemoryAssembly" />
     </type>
-
-    <!-- Native hosting accesses managed methods in the ComponentActivator class.
-         These are always rooted to ensure native calls get trimmer related errors
-         but will be trimmed away by the related feature switch -->
-    <type fullname="Internal.Runtime.InteropServices.ComponentActivator">
-      <method name="LoadAssemblyAndGetFunctionPointer" />
-      <method name="GetFunctionPointer" />
-    </type>
   </assembly>
 
   <!-- The private Event methods are accessed by private reflection in the base EventSource class. -->
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 5f0f0d2d916a92..0618f1644ea325 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
@@ -6,6 +6,14 @@
              https://github.com/mono/linker/pull/649 -->
       <method name=".ctor" />
     </type>
+
+    <!-- Native hosting accesses managed methods in the ComponentActivator class.
+         These are always rooted to ensure native calls get trimmer related errors
+         but will be trimmed away by the related feature switch -->
+    <type fullname="Internal.Runtime.InteropServices.ComponentActivator">
+      <method name="LoadAssemblyAndGetFunctionPointer" />
+      <method name="GetFunctionPointer" />
+    </type>
   </assembly>
   
   <!-- Properties and methods used by a debugger. -->

From 88fc7704e74034a9511062d568fd5defcd21f4c9 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Wed, 22 Dec 2021 10:54:51 +0100
Subject: [PATCH 3/3] Use
 System.Runtime.InteropServices.EnableConsumingManagedCodeFromNativeHosting

feature switch to keep native hosting ComponentActivator dependencies
---
 .../src/ILLink/ILLink.Descriptors.Shared.xml           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 0618f1644ea325..3def281c2bcab2 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
@@ -6,10 +6,14 @@
              https://github.com/mono/linker/pull/649 -->
       <method name=".ctor" />
     </type>
+  </assembly>
 
-    <!-- Native hosting accesses managed methods in the ComponentActivator class.
-         These are always rooted to ensure native calls get trimmer related errors
-         but will be trimmed away by the related feature switch -->
+  <assembly fullname="System.Private.CoreLib" feature="System.Runtime.InteropServices.EnableConsumingManagedCodeFromNativeHosting" featurevalue="true">
+    <!-- Native hosting accesses managed methods from
+    https://github.com/dotnet/runtime/blob/bbc898f3e5678135b242faeb6eefd8b24bf04f3c/src/native/corehost/hostpolicy/hostpolicy.cpp#L527-L538
+    but ComponentActivator is not trimming safe. We persist the methods only when `_EnableConsumingManagedCodeFromNativeHosting` setting
+    is enabled and only then we show the trimming warnings about possibly missing dependencies.
+    -->
     <type fullname="Internal.Runtime.InteropServices.ComponentActivator">
       <method name="LoadAssemblyAndGetFunctionPointer" />
       <method name="GetFunctionPointer" />