From 3f1bb91354fe1d5740a3afef2e65663b06780452 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Wed, 29 Jul 2020 13:02:07 -0700
Subject: [PATCH 1/2] Enable verbose linker output and bulk-suppress warnings

---
 eng/illink.targets                                 | 14 ++++++++++++++
 .../System.Private.CoreLib.csproj                  |  1 +
 src/libraries/Directory.Build.targets              |  2 +-
 .../System.Private.CoreLib.csproj                  |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index 79eb5d409643b7..56e2eee570f385 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -216,6 +216,20 @@
       <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
       <!-- keep DynamicDependencyAttribute unless a project explicitly disables it -->
       <ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
+      <!-- enable verbose output -->
+      <ILLinkArgs Condition="'$(ILLinkTrimAssemblyVerbose)' == 'true'">$(ILLinkArgs) --verbose</ILLinkArgs>
+      <!-- suppress warnings with the following codes:
+           IL2006:  The generic parameter 'T' from A with dynamically accessed member kinds B is passed into the generic parameter
+                    'T' from 'System.Lazy<T>' which requires dynamically accessed member kinds 'PublicParameterlessConstructor'
+           IL2008:  Could not find type A specified in resource B
+           IL2009:  Could not find method A in type B specified in resource C
+           IL2012:  Could not find field A in type B specified in resource C
+           IL2025:  Duplicate preserve of A in B
+           IL2026:  Calling A which has B can break functionality when trimming application code. The target method might be removed.
+           IL2035:  Unresolved assembly A in DynamicDependencyAttribute on B
+           IL2041:  The DynamicallyAccessedMembersAttribute is only allowed on method parameters, return value or generic parameters.
+      -->
+      <ILLinkArgs Condition="'$(ILLinkTrimAssemblyVerbose)' == 'true'">$(ILLinkArgs) --nowarn IL2006;IL2008;IL2009;IL2012;IL2025;IL2026;IL2035;IL2041</ILLinkArgs>
     </PropertyGroup>
 
     <MakeDir Directories="$(ILLinkTrimInputPath)" />
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index 501487c6a111bb..ff58ea7da28f2c 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -18,6 +18,7 @@
     <Platforms>x64;x86;arm;arm64</Platforms>
 
     <ILLinkTrimAssembly>true</ILLinkTrimAssembly>
+    <ILLinkTrimAssemblyVerbose>false</ILLinkTrimAssemblyVerbose>
     <ILLinkTrimXml>$(IntermediateOutputPath)System.Private.CoreLib.xml</ILLinkTrimXml>
   </PropertyGroup>
 
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 95dae2669d8e9a..dd43311db820be 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -92,7 +92,7 @@
       <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
       <SetProperties Condition="'$(IsNETCoreAppSrc)' == 'true' and
                                 '$(BinPlaceRuntime)' == 'true' and
-                                '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
+                                '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true;ILLinkTrimAssemblyVerbose=true</SetProperties>
     </BinPlaceTargetFrameworks>
     <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)"
                               Condition="'$(IsAspNetCoreApp)' == 'true'">
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index 95e1e72845ad16..a63244d8dcfc68 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -143,6 +143,7 @@
   <!-- ILLinker settings -->
   <PropertyGroup>
     <ILLinkTrimAssembly>true</ILLinkTrimAssembly>
+    <ILLinkTrimAssemblyVerbose>false</ILLinkTrimAssemblyVerbose>
     <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>
   </PropertyGroup>
 

From bed6c1d8efd3e983be1e8fbf9fc5befeecbb70f7 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu, 30 Jul 2020 09:50:57 -0500
Subject: [PATCH 2/2] Suppress ILLinker warnings for now, so ILLinker can
 enable warnings by default

---
 eng/illink.targets                                            | 4 +---
 .../src/System.Private.CoreLib/System.Private.CoreLib.csproj  | 1 -
 src/libraries/Directory.Build.targets                         | 2 +-
 .../System.Private.CoreLib/System.Private.CoreLib.csproj      | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index 56e2eee570f385..ddd4936cc26471 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -216,8 +216,6 @@
       <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
       <!-- keep DynamicDependencyAttribute unless a project explicitly disables it -->
       <ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
-      <!-- enable verbose output -->
-      <ILLinkArgs Condition="'$(ILLinkTrimAssemblyVerbose)' == 'true'">$(ILLinkArgs) --verbose</ILLinkArgs>
       <!-- suppress warnings with the following codes:
            IL2006:  The generic parameter 'T' from A with dynamically accessed member kinds B is passed into the generic parameter
                     'T' from 'System.Lazy<T>' which requires dynamically accessed member kinds 'PublicParameterlessConstructor'
@@ -229,7 +227,7 @@
            IL2035:  Unresolved assembly A in DynamicDependencyAttribute on B
            IL2041:  The DynamicallyAccessedMembersAttribute is only allowed on method parameters, return value or generic parameters.
       -->
-      <ILLinkArgs Condition="'$(ILLinkTrimAssemblyVerbose)' == 'true'">$(ILLinkArgs) --nowarn IL2006;IL2008;IL2009;IL2012;IL2025;IL2026;IL2035;IL2041</ILLinkArgs>
+      <ILLinkArgs>$(ILLinkArgs) --nowarn IL2006;IL2008;IL2009;IL2012;IL2025;IL2026;IL2035;IL2041</ILLinkArgs>
     </PropertyGroup>
 
     <MakeDir Directories="$(ILLinkTrimInputPath)" />
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index ff58ea7da28f2c..501487c6a111bb 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -18,7 +18,6 @@
     <Platforms>x64;x86;arm;arm64</Platforms>
 
     <ILLinkTrimAssembly>true</ILLinkTrimAssembly>
-    <ILLinkTrimAssemblyVerbose>false</ILLinkTrimAssemblyVerbose>
     <ILLinkTrimXml>$(IntermediateOutputPath)System.Private.CoreLib.xml</ILLinkTrimXml>
   </PropertyGroup>
 
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index dd43311db820be..95dae2669d8e9a 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -92,7 +92,7 @@
       <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
       <SetProperties Condition="'$(IsNETCoreAppSrc)' == 'true' and
                                 '$(BinPlaceRuntime)' == 'true' and
-                                '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true;ILLinkTrimAssemblyVerbose=true</SetProperties>
+                                '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
     </BinPlaceTargetFrameworks>
     <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)"
                               Condition="'$(IsAspNetCoreApp)' == 'true'">
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index a63244d8dcfc68..95e1e72845ad16 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -143,7 +143,6 @@
   <!-- ILLinker settings -->
   <PropertyGroup>
     <ILLinkTrimAssembly>true</ILLinkTrimAssembly>
-    <ILLinkTrimAssemblyVerbose>false</ILLinkTrimAssemblyVerbose>
     <ILLinkDirectory>$(MSBuildThisFileDirectory)src\ILLink\</ILLinkDirectory>
   </PropertyGroup>