From 84680bf557210114ea5ca823386cd49691c4cac6 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sat, 25 Dec 2021 02:34:58 +0100
Subject: [PATCH] Use
 System.Runtime.InteropServices.EnableConsumingManagedCodeFromNativeHosting
 (#62903)

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 0618f1644ea32..3def281c2bcab 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" />