From 3e75dfe72672b3c2f539123a50291903ada8def2 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 22 Mar 2021 15:29:57 +0100
Subject: [PATCH] Add native handlers linker suppression conditional to build
 only

---
 eng/illink.targets                                           | 5 +++++
 ...Suppressions.xml => ILLink.Suppressions.LibraryBuild.xml} | 0
 2 files changed, 5 insertions(+)
 rename src/libraries/System.Net.Http/src/ILLink/{ILLink.Suppressions.xml => ILLink.Suppressions.LibraryBuild.xml} (100%)

diff --git a/eng/illink.targets b/eng/illink.targets
index c7a97df0c4d36..2382ac2c24f63 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -34,6 +34,7 @@
 
     <ILLinkSuppressionsXmlFilePrefix>$(ILLinkDirectory)ILLink.Suppressions</ILLinkSuppressionsXmlFilePrefix>
     <ILLinkSuppressionsXmlFile>$(ILLinkSuppressionsXmlFilePrefix).xml</ILLinkSuppressionsXmlFile>
+    <ILLinkSuppressionsXmlFileLibraryBuild Condition="'$(ILLinkSuppressionsXmlFileLibraryBuild)' == '' and Exists('$(ILLinkSuppressionsXmlFile).LibraryBuild.xml')">$(ILLinkSuppressionsXmlFile).LibraryBuild.xml</ILLinkSuppressionsXmlFileLibraryBuild>
     <ILLinkSuppressionsConfigurationSpecificXmlFile>$(ILLinkSuppressionsXmlFilePrefix).$(Configuration).xml</ILLinkSuppressionsConfigurationSpecificXmlFile>
 
     <!-- if building a PDB, tell illink to rewrite the symbols file -->
@@ -42,6 +43,7 @@
 
   <ItemGroup>
     <None Include="$(ILLinkTrimXmlLibraryBuild)" Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''" />
+    <None Include="$(ILLinkSuppressionsXmlFileLibraryBuild)" Condition="'$(ILLinkSuppressionsXmlFileLibraryBuild)' != ''" />
     <None Include="@(ILLinkSubstitutionsXmls)" />
   </ItemGroup>
 
@@ -73,6 +75,8 @@
                             Include="$(ILLinkSuppressionsXmlFile)" />
     <ILLinkSuppressionsXmls Condition="Exists('$(ILLinkSuppressionsConfigurationSpecificXmlFile)')"
                             Include="$(ILLinkSuppressionsConfigurationSpecificXmlFile)" />
+    <ILLinkSuppressionsXmls Condition="Exists('$(ILLinkSuppressionsXmlFileLibraryBuild)')"
+                            Include="$(ILLinkSuppressionsXmlFileLibraryBuild)" />
     <ILLinkSuppressionsXmls Update="@(ILLinkSuppressionsXmls)" TargetPath="%(FileName).$(AssemblyName).xml" />
   </ItemGroup>
 
@@ -229,6 +233,7 @@
       <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
       <!-- pass the non-embedded root xml file on the command line -->
       <ILLinkArgs Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''">$(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)"</ILLinkArgs>
+      <ILLinkArgs Condition="'$(ILLinkSuppressionsXmlFileLibraryBuild)' != ''">$(ILLinkArgs) --link-attributes "$(ILLinkSuppressionsXmlFileLibraryBuild)"</ILLinkArgs>
       <!-- suppress warnings with the following codes:
            IL2008: Could not find type A specified in resource B
            IL2009: Could not find method A in type B specified in resource C
diff --git a/src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.LibraryBuild.xml
similarity index 100%
rename from src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.xml
rename to src/libraries/System.Net.Http/src/ILLink/ILLink.Suppressions.LibraryBuild.xml