From ded04e57cba4fe539bc9597d26ffeecaa30b55f4 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 25 May 2021 13:36:40 -0700
Subject: [PATCH 1/4] Removing unnecessary nowarns from trimming tests

---
 eng/testing/linker/project.csproj.template | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
index 7ac21cbcb5b5f0..95298969cf61ad 100644
--- a/eng/testing/linker/project.csproj.template
+++ b/eng/testing/linker/project.csproj.template
@@ -14,17 +14,7 @@
     <NETCoreAppMaximumVersion>{NetCoreAppMaximumVersion}</NETCoreAppMaximumVersion>
     <MicrosoftNETCoreAppVersion>{MicrosoftNETCoreAppVersion}</MicrosoftNETCoreAppVersion>
 
-    <!-- These can be removed once we get an SDK with https://github.com/mono/linker/pull/1385. -->
-    <LinkerNoWarn>IL2026</LinkerNoWarn>
-    <!-- IL2032,IL2055,IL2057-IL2061: Reflection intrinsics with unknown arguments -->
-    <LinkerNoWarn>$(LinkerNoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061</LinkerNoWarn>
-    <!-- IL2062-IL2066: Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
-    <LinkerNoWarn>$(LinkerNoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</LinkerNoWarn>
-    <!-- IL2067-IL2091: Unsatisfied DynamicallyAccessedMembers requirements -->
-    <LinkerNoWarn>$(LinkerNoWarn);IL2067;IL2068;IL2069;IL2070;IL2071;IL2072;IL2073;IL2074;IL2075;IL2076;IL2077;IL2078;IL2079;IL2080;IL2081;IL2082;IL2083;IL2084;IL2085;IL2086;IL2087;IL2088;IL2089;IL2090;IL2091</LinkerNoWarn>
-    <!-- https://github.com/dotnet/runtime/issues/40336 - need to suppress IL2008;IL2009;IL2037 on non-Windows -->
-    <LinkerNoWarn Condition="!$(RuntimeIdentifier.StartsWith('win'))">$(LinkerNoWarn);IL2008;IL2009;IL2037</LinkerNoWarn>
-    <_ExtraTrimmerArgs>{ExtraTrimmerArgs} $(_ExtraTrimmerArgs) --nowarn $(LinkerNoWarn)</_ExtraTrimmerArgs>
+    <_ExtraTrimmerArgs>{ExtraTrimmerArgs} $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
   </PropertyGroup>
 
   <ItemGroup>

From 9d84d784909ea80780ad83ff4d1a522b701f0924 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 25 May 2021 13:47:38 -0700
Subject: [PATCH 2/4] Also change the way we mark managedassemblies to link

---
 eng/testing/linker/SupportFiles/Directory.Build.targets | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets
index f6557707fe93a2..65221480b42521 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.targets
+++ b/eng/testing/linker/SupportFiles/Directory.Build.targets
@@ -28,11 +28,8 @@
           BeforeTargets="PrepareForILLink"> 
     <ItemGroup>
       <ManagedAssemblyToLink>
-        <TrimMode>link</TrimMode>
+        <IsTrimmable>true</IsTrimmable>
       </ManagedAssemblyToLink>
-
-      <!-- Pass the app assembly as a root -->
-      <TrimmerRootAssembly Include="@(IntermediateAssembly)" />
     </ItemGroup>
   </Target>
 

From 40ba84d7739a55b472c5f37591b0013cfc9bd706 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 25 May 2021 15:08:23 -0700
Subject: [PATCH 3/4] Remove target and instead use TrimmerDefaultAction

---
 eng/testing/linker/SupportFiles/Directory.Build.props   | 1 +
 eng/testing/linker/SupportFiles/Directory.Build.targets | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props
index 35cbc94439050e..fa6c9ff20c52ca 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.props
+++ b/eng/testing/linker/SupportFiles/Directory.Build.props
@@ -6,6 +6,7 @@
     <UseDefaultiOSFeatureSwitches>false</UseDefaultiOSFeatureSwitches>
     <PublishTrimmed>true</PublishTrimmed>
     <SkipImportRepoLinkerTargets>true</SkipImportRepoLinkerTargets>
+    <TrimmerDefaultAction>link</TrimmerDefaultAction>
     <TrimMode>link</TrimMode>
     <TrimmerRemoveSymbols>false</TrimmerRemoveSymbols>
     <SelfContained>true</SelfContained>
diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets
index 65221480b42521..ecdbc7771bc697 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.targets
+++ b/eng/testing/linker/SupportFiles/Directory.Build.targets
@@ -24,15 +24,6 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="EnsureAllAssembliesAreLinked"
-          BeforeTargets="PrepareForILLink"> 
-    <ItemGroup>
-      <ManagedAssemblyToLink>
-        <IsTrimmable>true</IsTrimmable>
-      </ManagedAssemblyToLink>
-    </ItemGroup>
-  </Target>
-
   <Target Name="CreateTestWasmAppBundle"
           AfterTargets="Publish"
           DependsOnTargets="BundleTestWasmApp"

From 7027588b2f807f1b605cf1baa0aef304e8843af2 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Tue, 25 May 2021 15:20:02 -0700
Subject: [PATCH 4/4] Adding the suppression of warnings from the linker

---
 eng/testing/linker/SupportFiles/Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props
index fa6c9ff20c52ca..46e0d3bcc0aad7 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.props
+++ b/eng/testing/linker/SupportFiles/Directory.Build.props
@@ -6,6 +6,7 @@
     <UseDefaultiOSFeatureSwitches>false</UseDefaultiOSFeatureSwitches>
     <PublishTrimmed>true</PublishTrimmed>
     <SkipImportRepoLinkerTargets>true</SkipImportRepoLinkerTargets>
+    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
     <TrimmerDefaultAction>link</TrimmerDefaultAction>
     <TrimMode>link</TrimMode>
     <TrimmerRemoveSymbols>false</TrimmerRemoveSymbols>