From b473edb501241d026eb7075607797abaef440105 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Wed, 22 Jul 2020 08:48:07 -0700
Subject: [PATCH 1/8] Add step to run linker on entire runtime pack during
 libraries build

---
 eng/Configurations.props                  |  1 +
 eng/illink.targets                        | 47 ++++++++-----
 src/libraries/Directory.Build.props       |  6 ++
 src/libraries/Directory.Build.targets     |  3 +
 src/libraries/illink-sharedframework.proj | 85 +++++++++++++++++++++++
 src/libraries/pretest.proj                | 13 ++++
 src/libraries/src.proj                    | 12 +++-
 7 files changed, 148 insertions(+), 19 deletions(-)
 create mode 100644 src/libraries/illink-sharedframework.proj

diff --git a/eng/Configurations.props b/eng/Configurations.props
index 59424f7cc30a6..ab2f5c414380d 100644
--- a/eng/Configurations.props
+++ b/eng/Configurations.props
@@ -34,6 +34,7 @@
 
   <!-- Honor the generic RuntimeConfiguration property. -->
   <PropertyGroup>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == '' AND ('$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release')">$(Configuration)</RuntimeConfiguration>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">Debug</RuntimeConfiguration>
diff --git a/eng/illink.targets b/eng/illink.targets
index ddd4936cc2647..72cf9a9b4d1a8 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -56,18 +56,18 @@
        Must be enabled by setting BinPlaceILLinkTrimAssembly=true
   -->
   <ItemGroup Condition="'$(BinPlaceILLinkTrimAssembly)' == 'true'">
-    <BinPlaceTargetFramework Include="$(BuildSettings)">
+    <BinPlaceTargetFrameworks Include="$(BuildSettings)">
       <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/trimmed</RuntimePath>
       <ItemName>TrimmedItem</ItemName>
-    </BinPlaceTargetFramework>
-    <BinPlaceTargetFramework Include="$(BuildSettings)">
+    </BinPlaceTargetFrameworks>
+    <BinPlaceTargetFrameworks Include="$(BuildSettings)">
       <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/reports</RuntimePath>
       <ItemName>TrimmingReport</ItemName>
-    </BinPlaceTargetFramework>
-    <BinPlaceTargetFramework Include="$(BuildSettings)">
-      <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/pretrimmed</RuntimePath>
+    </BinPlaceTargetFrameworks>
+    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
+      <RuntimePath>$(LibrariesPretrimmedArtifactsPath)</RuntimePath>
       <ItemName>PreTrimmedItem</ItemName>
-    </BinPlaceTargetFramework>
+    </BinPlaceTargetFrameworks>
   </ItemGroup>
 
   <Target Name="_EmbedILLinkXmls"
@@ -184,6 +184,16 @@
     </PropertyGroup>
   </Target>
 
+  <!-- Binplacing for pre-trimming that is used when running the linker
+       on the entire runtime pack to observe warnings from verbose output.
+  -->
+  <ItemGroup>
+    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
+      <RuntimePath>$(LibrariesPretrimmedArtifactsPath)</RuntimePath>
+      <ItemName>PreTrimmedItem</ItemName>
+    </BinPlaceTargetFrameworks>
+  </ItemGroup>
+
   <!-- ILLinkTrimAssembly
        Examines the "input assembly" for IL that is unreachable from public API and trims that,
        rewriting the assembly to an "output assembly"
@@ -217,17 +227,18 @@
       <!-- keep DynamicDependencyAttribute unless a project explicitly disables it -->
       <ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</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.
+           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
+           IL2050: P/invoke method A declares a parameter with COM marshalling. Correctness of COM interop
+                   cannot be guaranteed after trimming. Interfaces and interface members might be removed.
       -->
-      <ILLinkArgs>$(ILLinkArgs) --nowarn IL2006;IL2008;IL2009;IL2012;IL2025;IL2026;IL2035;IL2041</ILLinkArgs>
+      <ILLinkArgs>$(ILLinkArgs) --nowarn IL2006;IL2008;IL2009;IL2012;IL2025;IL2026;IL2035;IL2050</ILLinkArgs>
     </PropertyGroup>
 
     <MakeDir Directories="$(ILLinkTrimInputPath)" />
@@ -312,7 +323,7 @@
   <!-- Similar to _CheckForCompileOutputs and runs in the same places,
        always set these even if compile didn't run. -->
   <Target Name="_CheckForILLinkTrimAssemblyOutputs"
-          BeforeTargets="CopyFilesToOutputDirectory;_CleanGetCurrentAndPriorFileWrites"
+          BeforeTargets="BinPlace;CopyFilesToOutputDirectory;_CleanGetCurrentAndPriorFileWrites"
           Condition="'$(ILLinkTrimAssembly)' == 'true'">
     <ItemGroup>
       <PreTrimmedItem Condition="Exists('$(ILLinkTrimInputAssembly)')" Include="$(ILLinkTrimInputAssembly)" />
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 57898d4ff67e4..eb1e37ed06760 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -328,4 +328,10 @@
     <CLSCompliant Condition="'$(CLSCompliant)' == '' and ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true')">false</CLSCompliant>
     <CLSCompliant Condition="'$(CLSCompliant)' == ''">true</CLSCompliant>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <LibrariesPretrimmedArtifactsPath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/pretrimmed</LibrariesPretrimmedArtifactsPath>
+    <LibrariesTrimmedArtifactsPath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/entire_runtimepack_trimmed</LibrariesTrimmedArtifactsPath>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index cc196f26392a7..6fbc161b120dc 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -64,6 +64,9 @@
     <BinPlaceRef Condition="'$(BinPlaceRef)' == '' and ('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef>
     <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' and ('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime>
     <BinPlaceForTargetVertical Condition="'$(BinPlaceForTargetVertical)' == ''">true</BinPlaceForTargetVertical>
+
+    <!-- All IsNETCoreApp assemblies will get binplaced to the test sharedframework after the ILLink step. -->
+    <BinPlaceTestSharedFramework Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildAllProjects)' == 'true'">false</BinPlaceTestSharedFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">
diff --git a/src/libraries/illink-sharedframework.proj b/src/libraries/illink-sharedframework.proj
new file mode 100644
index 0000000000000..83ab7da99dbea
--- /dev/null
+++ b/src/libraries/illink-sharedframework.proj
@@ -0,0 +1,85 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <Target Name="ILLinkTrimSharedFramework"
+          AfterTargets="Build">
+
+    <PropertyGroup>
+      <!-- default action for core assemblies -->
+      <ILLinkArgs>$(ILLinkArgs) -c link</ILLinkArgs>
+      <!-- keep type-forward assemblies (facades) -->
+      <ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs>
+      <!-- update debug symbols -->
+      <ILLinkArgs>$(ILLinkArgs) -b true</ILLinkArgs>
+      <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
+      <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
+      <!-- pass the non-embedded root xml file on the command line -->
+      <ILLinkArgs Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''">$(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)"</ILLinkArgs>
+      <!-- don't remove the embedded substitutions xml resource since ILLink may run again on the assembly -->
+      <ILLinkArgs Condition="'$(ILLinkSubstitutionsXml)' != ''">$(ILLinkArgs) --strip-substitutions false</ILLinkArgs>
+      <!-- don't remove the embedded link attributes xml resource since ILLink may run again on the assembly -->
+      <!-- and ignore the link attributes xml file during the library build, since we need the attributes preserved until the final app is linked -->
+      <ILLinkArgs>$(ILLinkArgs) --strip-link-attributes false --ignore-link-attributes true</ILLinkArgs>
+      <!-- ignore unresolved references -->
+      <ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
+      <!-- keep interface implementations -->
+      <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
+      <!-- keep DynamicDependencyAttribute -->
+      <ILLinkArgs>$(ILLinkArgs) --keep-dep-attributes true</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'
+           IL2009: Could not find method 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
+           IL2050: P/invoke method A declares a parameter with COM marshalling. Correctness of COM interop
+                   cannot be guaranteed after trimming. Interfaces and interface members might be removed.
+      -->
+      <ILLinkArgs>$(ILLinkArgs) --nowarn IL2006;IL2009;IL2025;IL2026;IL2035;IL2050</ILLinkArgs>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- add two directories to load references: the libraries directory and CoreLib's directory -->
+      <_DependencyDirectories Include="$(LibrariesPretrimmedArtifactsPath.TrimEnd('\'))" />
+      <_DependencyDirectories Include="$(CoreCLRArtifactsPath)IL" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <ILLinkArgs>$(ILLinkArgs) -d @(_DependencyDirectories->'"%(Identity)"', ' -d ')</ILLinkArgs>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_AssembliesToLink Include="System.Private.CoreLib" />
+
+      <_LibrariesToLink Include="$(LibrariesPretrimmedArtifactsPath)*.dll" />
+      <_AssembliesToLink Include="@(_LibrariesToLink->'%(FileName)')" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <ILLinkArgs>$(ILLinkArgs) -a @(_AssembliesToLink->'%(Identity)', ' -a ')</ILLinkArgs>
+
+      <!-- Not currently using the trimmed CoreLib because it has already been trimmed and crossgen'd. -->
+      <ILLinkArgs>$(ILLinkArgs) -p copy System.Private.CoreLib</ILLinkArgs>
+    </PropertyGroup>
+
+    <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
+      In this case, explicitly specify the path to the dotnet host. -->
+    <PropertyGroup Condition=" '$(DOTNET_HOST_PATH)' == '' ">
+      <_DotNetHostDirectory>$(RepoRoot).dotnet</_DotNetHostDirectory>
+      <_DotNetHostFileName>dotnet</_DotNetHostFileName>
+      <_DotNetHostFileName Condition=" '$(OS)' == 'Windows_NT' ">dotnet.exe</_DotNetHostFileName>
+    </PropertyGroup>
+
+    <ILLink AssemblyPaths="$(LibrariesPretrimmedArtifactsPath)"
+        RootAssemblyNames=""
+        OutputDirectory="$(LibrariesTrimmedArtifactsPath)"
+        ExtraArgs="$(ILLinkArgs)"
+        ToolExe="$(_DotNetHostFileName)"
+        ToolPath="$(_DotNetHostDirectory)" />
+
+    <!-- Remove the copied CoreLib since it is not used. -->
+    <Delete Files="$(LibrariesTrimmedArtifactsPath)System.Private.CoreLib.dll" />
+  </Target>
+
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" />
+</Project>
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 5cd55be973cb4..5a24a1797a22c 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -27,6 +27,19 @@
              Properties="$(TraversalGlobalProperties)" />
   </Target>
 
+  <Target Name="CopyILTrimmedSharedFrameworkLibraries"
+          Condition="'$(BinplaceTestSharedFramework)' == 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"
+          AfterTargets="RestoreTestHost">
+
+    <ItemGroup>
+      <LibrariesSharedFrameworkFiles Include="$(LibrariesSharedFrameworkBinArtifactsPath)*.*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(LibrariesSharedFrameworkFiles)PostRuntimePackTrim\"
+          DestinationFolder="$(TestHostRuntimePath)PostRuntimePackTrim\" />
+
+  </Target>
+
   <Target Name="CreateIntermediateRunSettingsFile"
           DependsOnTargets="GenerateRunSettingsFile"
           BeforeTargets="Build"
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index c534a380309d5..f66e48c6a7f06 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -14,6 +14,7 @@
                                 $(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj;
                                 $(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj"
                        Exclude="@(NonNetCoreAppProject)" />
+    <ILLinkSharedFrameworkProject Include="illink-sharedframework.proj" />
     <ManualShimProject Include="shims\manual\*.csproj" />
     <ApiCompatProject Include="shims\ApiCompat.proj"
                       Condition="'$(DotNetBuildFromSource)' != 'true' and
@@ -25,7 +26,8 @@
     <ProjectReference Include="@(NetCoreAppProject)" />
 
     <!-- Restore only and build before/after. -->
-    <ProjectReference Include="@(NonNetCoreAppProject);
+    <ProjectReference Include="@(ILLinkSharedFrameworkProject);
+                               @(NonNetCoreAppProject);
                                @(ManualShimProject);
                                @(ApiCompatProject)"
                       Condition="'$(MSBuildRestoreSessionId)' != ''" />
@@ -49,6 +51,14 @@
              Properties="$(TraversalGlobalProperties)" />
   </Target>
 
+  <Target Name="ILLinkSharedFramework"
+          AfterTargets="Build">
+    <MSBuild Targets="Build"
+             Projects="@(ILLinkSharedFrameworkProject)"
+             Properties="$(TraversalGlobalProperties)"
+    />
+  </Target>
+
   <Target Name="RunApiCompat"
           Condition="'@(ApiCompatProject)' != ''"
           AfterTargets="BuildManualShims">

From 6e5944d91f42f8795320d63c9208d7be8d179866 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Thu, 30 Jul 2020 23:13:41 -0700
Subject: [PATCH 2/8] Address feedback

---
 eng/illink.targets                        | 22 +++++++++-------------
 src/libraries/Directory.Build.props       |  5 +++--
 src/libraries/Directory.Build.targets     |  3 ---
 src/libraries/illink-sharedframework.proj |  3 ---
 src/libraries/pretest.proj                | 13 -------------
 5 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index 72cf9a9b4d1a8..1842ce4e1b335 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -52,18 +52,24 @@
     <None Include="@(ILLinkSubstitutionsXmls)" />
   </ItemGroup>
 
-  <!-- Custom binplacing for pre/post-trimming and reports that is useful for analysis
+  <!-- Custom binplacing for post-trimming and reports that is useful for analysis
        Must be enabled by setting BinPlaceILLinkTrimAssembly=true
   -->
   <ItemGroup Condition="'$(BinPlaceILLinkTrimAssembly)' == 'true'">
     <BinPlaceTargetFrameworks Include="$(BuildSettings)">
-      <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/trimmed</RuntimePath>
+      <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'trimmed'))</RuntimePath>
       <ItemName>TrimmedItem</ItemName>
     </BinPlaceTargetFrameworks>
     <BinPlaceTargetFrameworks Include="$(BuildSettings)">
-      <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/reports</RuntimePath>
+      <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'reports'))</RuntimePath>
       <ItemName>TrimmingReport</ItemName>
     </BinPlaceTargetFrameworks>
+  </ItemGroup>
+
+  <!-- Binplacing for pre-trimming that is used when running the linker
+       on the entire runtime pack to observe warnings from verbose output
+  -->
+  <ItemGroup>
     <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
       <RuntimePath>$(LibrariesPretrimmedArtifactsPath)</RuntimePath>
       <ItemName>PreTrimmedItem</ItemName>
@@ -184,16 +190,6 @@
     </PropertyGroup>
   </Target>
 
-  <!-- Binplacing for pre-trimming that is used when running the linker
-       on the entire runtime pack to observe warnings from verbose output.
-  -->
-  <ItemGroup>
-    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
-      <RuntimePath>$(LibrariesPretrimmedArtifactsPath)</RuntimePath>
-      <ItemName>PreTrimmedItem</ItemName>
-    </BinPlaceTargetFrameworks>
-  </ItemGroup>
-
   <!-- ILLinkTrimAssembly
        Examines the "input assembly" for IL that is unreachable from public API and trims that,
        rewriting the assembly to an "output assembly"
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index eb1e37ed06760..7efa6125229f8 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -330,8 +330,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LibrariesPretrimmedArtifactsPath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/pretrimmed</LibrariesPretrimmedArtifactsPath>
-    <LibrariesTrimmedArtifactsPath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/entire_runtimepack_trimmed</LibrariesTrimmedArtifactsPath>
+    <LibrariesTrimmingArtifactsRoot>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)'))</LibrariesTrimmingArtifactsRoot>
+    <LibrariesPretrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'pretrimmed'))</LibrariesPretrimmedArtifactsPath>
+    <LibrariesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'trimmed-runtimepack'))</LibrariesTrimmedArtifactsPath>
   </PropertyGroup>
 
 </Project>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 6fbc161b120dc..cc196f26392a7 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -64,9 +64,6 @@
     <BinPlaceRef Condition="'$(BinPlaceRef)' == '' and ('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef>
     <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' and ('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime>
     <BinPlaceForTargetVertical Condition="'$(BinPlaceForTargetVertical)' == ''">true</BinPlaceForTargetVertical>
-
-    <!-- All IsNETCoreApp assemblies will get binplaced to the test sharedframework after the ILLink step. -->
-    <BinPlaceTestSharedFramework Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildAllProjects)' == 'true'">false</BinPlaceTestSharedFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">
diff --git a/src/libraries/illink-sharedframework.proj b/src/libraries/illink-sharedframework.proj
index 83ab7da99dbea..6b4c48b8d119d 100644
--- a/src/libraries/illink-sharedframework.proj
+++ b/src/libraries/illink-sharedframework.proj
@@ -76,9 +76,6 @@
         ExtraArgs="$(ILLinkArgs)"
         ToolExe="$(_DotNetHostFileName)"
         ToolPath="$(_DotNetHostDirectory)" />
-
-    <!-- Remove the copied CoreLib since it is not used. -->
-    <Delete Files="$(LibrariesTrimmedArtifactsPath)System.Private.CoreLib.dll" />
   </Target>
 
   <Import Project="$(RepositoryEngineeringDir)illink.targets" />
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 5a24a1797a22c..5cd55be973cb4 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -27,19 +27,6 @@
              Properties="$(TraversalGlobalProperties)" />
   </Target>
 
-  <Target Name="CopyILTrimmedSharedFrameworkLibraries"
-          Condition="'$(BinplaceTestSharedFramework)' == 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"
-          AfterTargets="RestoreTestHost">
-
-    <ItemGroup>
-      <LibrariesSharedFrameworkFiles Include="$(LibrariesSharedFrameworkBinArtifactsPath)*.*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(LibrariesSharedFrameworkFiles)PostRuntimePackTrim\"
-          DestinationFolder="$(TestHostRuntimePath)PostRuntimePackTrim\" />
-
-  </Target>
-
   <Target Name="CreateIntermediateRunSettingsFile"
           DependsOnTargets="GenerateRunSettingsFile"
           BeforeTargets="Build"

From 5cf9bd216313e6183c7b82767cd1de540eab5953 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Fri, 31 Jul 2020 09:18:05 -0700
Subject: [PATCH 3/8] Only run for NetCoreAppCurrent

---
 src/libraries/illink-sharedframework.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libraries/illink-sharedframework.proj b/src/libraries/illink-sharedframework.proj
index 6b4c48b8d119d..98a93f34cc90b 100644
--- a/src/libraries/illink-sharedframework.proj
+++ b/src/libraries/illink-sharedframework.proj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.Build.Traversal">
 
   <Target Name="ILLinkTrimSharedFramework"
-          AfterTargets="Build">
+          AfterTargets="Build"
+          Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">
 
     <PropertyGroup>
       <!-- default action for core assemblies -->

From 7da645648d6d1aefb12b9be0ef9514c2b63903d0 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Fri, 31 Jul 2020 12:01:42 -0700
Subject: [PATCH 4/8] Include appropriate S.P.CoreLib

---
 src/libraries/illink-sharedframework.proj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libraries/illink-sharedframework.proj b/src/libraries/illink-sharedframework.proj
index 98a93f34cc90b..9548268a7a535 100644
--- a/src/libraries/illink-sharedframework.proj
+++ b/src/libraries/illink-sharedframework.proj
@@ -42,7 +42,8 @@
     <ItemGroup>
       <!-- add two directories to load references: the libraries directory and CoreLib's directory -->
       <_DependencyDirectories Include="$(LibrariesPretrimmedArtifactsPath.TrimEnd('\'))" />
-      <_DependencyDirectories Include="$(CoreCLRArtifactsPath)IL" />
+      <_DependencyDirectories Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', 'IL'))" />
+      <_DependencyDirectories Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$([MSBuild]::NormalizePath('$(MonoArtifactsPath)', 'IL'))" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -79,5 +80,5 @@
         ToolPath="$(_DotNetHostDirectory)" />
   </Target>
 
-  <Import Project="$(RepositoryEngineeringDir)illink.targets" />
+  <Import Project="$([MSBuild]::NormalizePath('$(RepositoryEngineeringDir)', 'illink.targets'))" />
 </Project>

From aa9cd3ab2607deebf4f90ec1114a11417a152816 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Mon, 3 Aug 2020 12:17:21 -0700
Subject: [PATCH 5/8] Address review feedback

---
 eng/Configurations.props                      |  1 -
 eng/illink.targets                            |  8 +----
 src/libraries/Directory.Build.props           |  1 -
 ...k.proj => illink-sharedframeworks.targets} | 31 ++++++++++---------
 src/libraries/src.proj                        | 13 ++------
 5 files changed, 21 insertions(+), 33 deletions(-)
 rename src/libraries/{illink-sharedframework.proj => illink-sharedframeworks.targets} (77%)

diff --git a/eng/Configurations.props b/eng/Configurations.props
index ab2f5c414380d..59424f7cc30a6 100644
--- a/eng/Configurations.props
+++ b/eng/Configurations.props
@@ -34,7 +34,6 @@
 
   <!-- Honor the generic RuntimeConfiguration property. -->
   <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == '' AND ('$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release')">$(Configuration)</RuntimeConfiguration>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">Debug</RuntimeConfiguration>
diff --git a/eng/illink.targets b/eng/illink.targets
index 1842ce4e1b335..e0baead48fcc9 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -64,14 +64,8 @@
       <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'reports'))</RuntimePath>
       <ItemName>TrimmingReport</ItemName>
     </BinPlaceTargetFrameworks>
-  </ItemGroup>
-
-  <!-- Binplacing for pre-trimming that is used when running the linker
-       on the entire runtime pack to observe warnings from verbose output
-  -->
-  <ItemGroup>
     <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
-      <RuntimePath>$(LibrariesPretrimmedArtifactsPath)</RuntimePath>
+      <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'pretrimmed'))</RuntimePath>
       <ItemName>PreTrimmedItem</ItemName>
     </BinPlaceTargetFrameworks>
   </ItemGroup>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 7efa6125229f8..a2f6b39f8abbf 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -331,7 +331,6 @@
 
   <PropertyGroup>
     <LibrariesTrimmingArtifactsRoot>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)'))</LibrariesTrimmingArtifactsRoot>
-    <LibrariesPretrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'pretrimmed'))</LibrariesPretrimmedArtifactsPath>
     <LibrariesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'trimmed-runtimepack'))</LibrariesTrimmedArtifactsPath>
   </PropertyGroup>
 
diff --git a/src/libraries/illink-sharedframework.proj b/src/libraries/illink-sharedframeworks.targets
similarity index 77%
rename from src/libraries/illink-sharedframework.proj
rename to src/libraries/illink-sharedframeworks.targets
index 9548268a7a535..193f6b036cae5 100644
--- a/src/libraries/illink-sharedframework.proj
+++ b/src/libraries/illink-sharedframeworks.targets
@@ -1,8 +1,6 @@
-<Project Sdk="Microsoft.Build.Traversal">
+<Project>
 
-  <Target Name="ILLinkTrimSharedFramework"
-          AfterTargets="Build"
-          Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">
+  <Target Name="ILLinkTrimSharedFramework" AfterTargets="Build">
 
     <PropertyGroup>
       <!-- default action for core assemblies -->
@@ -39,11 +37,19 @@
       <ILLinkArgs>$(ILLinkArgs) --nowarn IL2006;IL2009;IL2025;IL2026;IL2035;IL2050</ILLinkArgs>
     </PropertyGroup>
 
+     <!-- Retrieve CoreLib's targetpath via GetTargetPath as it isn't binplaced yet. -->
+    <MSBuild Projects="$(CoreLibProject)"
+             Targets="GetTargetPath">
+      <Output TaskParameter="TargetOutputs" PropertyName="SystemPrivateCoreLibPath" />
+    </MSBuild>
+
+    <PropertyGroup>
+      <_AssemblyPaths>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir);$(SystemPrivateCoreLibPath)</_AssemblyPaths>
+    </PropertyGroup>
+
     <ItemGroup>
-      <!-- add two directories to load references: the libraries directory and CoreLib's directory -->
-      <_DependencyDirectories Include="$(LibrariesPretrimmedArtifactsPath.TrimEnd('\'))" />
-      <_DependencyDirectories Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', 'IL'))" />
-      <_DependencyDirectories Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$([MSBuild]::NormalizePath('$(MonoArtifactsPath)', 'IL'))" />
+      <!-- add references from the libraries directory -->
+      <_DependencyDirectories Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir.TrimEnd('\'))" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -53,15 +59,12 @@
     <ItemGroup>
       <_AssembliesToLink Include="System.Private.CoreLib" />
 
-      <_LibrariesToLink Include="$(LibrariesPretrimmedArtifactsPath)*.dll" />
+      <_LibrariesToLink Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" />
       <_AssembliesToLink Include="@(_LibrariesToLink->'%(FileName)')" />
     </ItemGroup>
 
     <PropertyGroup>
-      <ILLinkArgs>$(ILLinkArgs) -a @(_AssembliesToLink->'%(Identity)', ' -a ')</ILLinkArgs>
-
-      <!-- Not currently using the trimmed CoreLib because it has already been trimmed and crossgen'd. -->
-      <ILLinkArgs>$(ILLinkArgs) -p copy System.Private.CoreLib</ILLinkArgs>
+      <ILLinkArgs>$(ILLinkArgs) -r @(_AssembliesToLink->'%(Identity)', ' -r ')</ILLinkArgs>
     </PropertyGroup>
 
     <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
@@ -72,7 +75,7 @@
       <_DotNetHostFileName Condition=" '$(OS)' == 'Windows_NT' ">dotnet.exe</_DotNetHostFileName>
     </PropertyGroup>
 
-    <ILLink AssemblyPaths="$(LibrariesPretrimmedArtifactsPath)"
+    <ILLink AssemblyPaths="$(_AssemblyPaths)"
         RootAssemblyNames=""
         OutputDirectory="$(LibrariesTrimmedArtifactsPath)"
         ExtraArgs="$(ILLinkArgs)"
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index f66e48c6a7f06..29b5fe6d620e9 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -14,7 +14,6 @@
                                 $(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj;
                                 $(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj"
                        Exclude="@(NonNetCoreAppProject)" />
-    <ILLinkSharedFrameworkProject Include="illink-sharedframework.proj" />
     <ManualShimProject Include="shims\manual\*.csproj" />
     <ApiCompatProject Include="shims\ApiCompat.proj"
                       Condition="'$(DotNetBuildFromSource)' != 'true' and
@@ -26,8 +25,7 @@
     <ProjectReference Include="@(NetCoreAppProject)" />
 
     <!-- Restore only and build before/after. -->
-    <ProjectReference Include="@(ILLinkSharedFrameworkProject);
-                               @(NonNetCoreAppProject);
+    <ProjectReference Include="@(NonNetCoreAppProject);
                                @(ManualShimProject);
                                @(ApiCompatProject)"
                       Condition="'$(MSBuildRestoreSessionId)' != ''" />
@@ -51,13 +49,8 @@
              Properties="$(TraversalGlobalProperties)" />
   </Target>
 
-  <Target Name="ILLinkSharedFramework"
-          AfterTargets="Build">
-    <MSBuild Targets="Build"
-             Projects="@(ILLinkSharedFrameworkProject)"
-             Properties="$(TraversalGlobalProperties)"
-    />
-  </Target>
+  <Import Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"
+          Project="$(MSBuildThisFileDirectory)\illink-sharedframeworks.targets" />
 
   <Target Name="RunApiCompat"
           Condition="'@(ApiCompatProject)' != ''"

From d26e458700fdefa32f212e179a9a75189e05300e Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Mon, 3 Aug 2020 21:37:04 -0700
Subject: [PATCH 6/8] Add common property group for shared linker args; remove
 unneeded changes from PR

---
 eng/illink.targets                            | 58 +++++++++++--------
 src/libraries/Directory.Build.props           |  3 +-
 src/libraries/illink-sharedframeworks.targets | 21 +------
 3 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index e0baead48fcc9..4d76c0718db33 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -52,22 +52,22 @@
     <None Include="@(ILLinkSubstitutionsXmls)" />
   </ItemGroup>
 
-  <!-- Custom binplacing for post-trimming and reports that is useful for analysis
+  <!-- Custom binplacing for pre/post-trimming and reports that is useful for analysis
        Must be enabled by setting BinPlaceILLinkTrimAssembly=true
   -->
   <ItemGroup Condition="'$(BinPlaceILLinkTrimAssembly)' == 'true'">
-    <BinPlaceTargetFrameworks Include="$(BuildSettings)">
-      <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'trimmed'))</RuntimePath>
+    <BinPlaceTargetFramework Include="$(BuildSettings)">
+      <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/trimmed</RuntimePath>
       <ItemName>TrimmedItem</ItemName>
-    </BinPlaceTargetFrameworks>
-    <BinPlaceTargetFrameworks Include="$(BuildSettings)">
-      <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'reports'))</RuntimePath>
+    </BinPlaceTargetFramework>
+    <BinPlaceTargetFramework Include="$(BuildSettings)">
+      <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/reports</RuntimePath>
       <ItemName>TrimmingReport</ItemName>
-    </BinPlaceTargetFrameworks>
-    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
-      <RuntimePath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'pretrimmed'))</RuntimePath>
+    </BinPlaceTargetFramework>
+    <BinPlaceTargetFramework Include="$(BuildSettings)">
+      <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildSettings)/pretrimmed</RuntimePath>
       <ItemName>PreTrimmedItem</ItemName>
-    </BinPlaceTargetFrameworks>
+    </BinPlaceTargetFramework>
   </ItemGroup>
 
   <Target Name="_EmbedILLinkXmls"
@@ -184,23 +184,11 @@
     </PropertyGroup>
   </Target>
 
-  <!-- ILLinkTrimAssembly
-       Examines the "input assembly" for IL that is unreachable from public API and trims that,
-       rewriting the assembly to an "output assembly"
-  -->
-  <UsingTask TaskName="ILLink" AssemblyFile="$(ILLinkTasksPath)" />
-  <Target Name="ILLinkTrimAssembly" Condition="'$(ILLinkTrimAssembly)' == 'true'">
+  <!-- ILLink.Tasks arguments common to runs for both individual libraries' and for the entire runtime pack -->
+  <Target Name="SetCommonILLinkArgs">
     <PropertyGroup>
-      <ILLinkArgs>$(ILLinkArgs)-r $(TargetName)</ILLinkArgs>
-      <!-- default action for core assemblies -->
-      <ILLinkArgs>$(ILLinkArgs) -c skip</ILLinkArgs>
-      <!-- default action for non-core assemblies -->
-      <ILLinkArgs>$(ILLinkArgs) -u skip</ILLinkArgs>
-      <!-- trim the target assembly -->
-      <ILLinkArgs>$(ILLinkArgs) -p link $(TargetName)</ILLinkArgs>
       <!-- keep type-forward assemblies (facades) -->
       <ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs>
-      <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
       <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
       <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
       <!-- pass the non-embedded root xml file on the command line -->
@@ -214,6 +202,26 @@
       <ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
       <!-- keep interface implementations -->
       <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
+    </PropertyGroup>
+  </Target>
+
+  <!-- ILLinkTrimAssembly
+       Examines the "input assembly" for IL that is unreachable from public API and trims that,
+       rewriting the assembly to an "output assembly"
+  -->
+  <UsingTask TaskName="ILLink" AssemblyFile="$(ILLinkTasksPath)" />
+  <Target Name="ILLinkTrimAssembly"
+          Condition="'$(ILLinkTrimAssembly)' == 'true'"
+          DependsOnTargets="SetCommonILLinkArgs">
+    <PropertyGroup>
+      <ILLinkArgs>$(ILLinkArgs) -r $(TargetName)</ILLinkArgs>
+      <!-- default action for core assemblies -->
+      <ILLinkArgs>$(ILLinkArgs) -c skip</ILLinkArgs>
+      <!-- default action for non-core assemblies -->
+      <ILLinkArgs>$(ILLinkArgs) -u skip</ILLinkArgs>
+      <!-- trim the target assembly -->
+      <ILLinkArgs>$(ILLinkArgs) -p link $(TargetName)</ILLinkArgs>
+      <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
       <!-- keep DynamicDependencyAttribute unless a project explicitly disables it -->
       <ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
       <!-- suppress warnings with the following codes:
@@ -313,7 +321,7 @@
   <!-- Similar to _CheckForCompileOutputs and runs in the same places,
        always set these even if compile didn't run. -->
   <Target Name="_CheckForILLinkTrimAssemblyOutputs"
-          BeforeTargets="BinPlace;CopyFilesToOutputDirectory;_CleanGetCurrentAndPriorFileWrites"
+          BeforeTargets="CopyFilesToOutputDirectory;_CleanGetCurrentAndPriorFileWrites"
           Condition="'$(ILLinkTrimAssembly)' == 'true'">
     <ItemGroup>
       <PreTrimmedItem Condition="Exists('$(ILLinkTrimInputAssembly)')" Include="$(ILLinkTrimInputAssembly)" />
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index a2f6b39f8abbf..fa087cfc37cce 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -330,8 +330,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LibrariesTrimmingArtifactsRoot>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)'))</LibrariesTrimmingArtifactsRoot>
-    <LibrariesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(LibrariesTrimmingArtifactsRoot)', 'trimmed-runtimepack'))</LibrariesTrimmedArtifactsPath>
+    <LibrariesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-runtimepack'))</LibrariesTrimmedArtifactsPath>
   </PropertyGroup>
 
 </Project>
diff --git a/src/libraries/illink-sharedframeworks.targets b/src/libraries/illink-sharedframeworks.targets
index 193f6b036cae5..d4b1aa79c3236 100644
--- a/src/libraries/illink-sharedframeworks.targets
+++ b/src/libraries/illink-sharedframeworks.targets
@@ -1,29 +1,14 @@
 <Project>
 
-  <Target Name="ILLinkTrimSharedFramework" AfterTargets="Build">
+  <Target Name="ILLinkTrimSharedFramework"
+          AfterTargets="Build"
+          DependsOnTargets="SetCommonILLinkArgs">
 
     <PropertyGroup>
       <!-- default action for core assemblies -->
       <ILLinkArgs>$(ILLinkArgs) -c link</ILLinkArgs>
-      <!-- keep type-forward assemblies (facades) -->
-      <ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs>
       <!-- update debug symbols -->
       <ILLinkArgs>$(ILLinkArgs) -b true</ILLinkArgs>
-      <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
-      <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
-      <!-- pass the non-embedded root xml file on the command line -->
-      <ILLinkArgs Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''">$(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)"</ILLinkArgs>
-      <!-- don't remove the embedded substitutions xml resource since ILLink may run again on the assembly -->
-      <ILLinkArgs Condition="'$(ILLinkSubstitutionsXml)' != ''">$(ILLinkArgs) --strip-substitutions false</ILLinkArgs>
-      <!-- don't remove the embedded link attributes xml resource since ILLink may run again on the assembly -->
-      <!-- and ignore the link attributes xml file during the library build, since we need the attributes preserved until the final app is linked -->
-      <ILLinkArgs>$(ILLinkArgs) --strip-link-attributes false --ignore-link-attributes true</ILLinkArgs>
-      <!-- ignore unresolved references -->
-      <ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
-      <!-- keep interface implementations -->
-      <ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
-      <!-- keep DynamicDependencyAttribute -->
-      <ILLinkArgs>$(ILLinkArgs) --keep-dep-attributes true</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'

From 618e9c02c5080415f6f6d668d2a9ea271c2d3969 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Mon, 3 Aug 2020 21:41:07 -0700
Subject: [PATCH 7/8] Rename illink-sharedframeworks.targets to
 illink-sharedframework.targets

---
 ...-sharedframeworks.targets => illink-sharedframework.targets} | 0
 src/libraries/src.proj                                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/libraries/{illink-sharedframeworks.targets => illink-sharedframework.targets} (100%)

diff --git a/src/libraries/illink-sharedframeworks.targets b/src/libraries/illink-sharedframework.targets
similarity index 100%
rename from src/libraries/illink-sharedframeworks.targets
rename to src/libraries/illink-sharedframework.targets
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 29b5fe6d620e9..ce82c68ea701a 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -50,7 +50,7 @@
   </Target>
 
   <Import Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"
-          Project="$(MSBuildThisFileDirectory)\illink-sharedframeworks.targets" />
+          Project="$(MSBuildThisFileDirectory)\illink-sharedframework.targets" />
 
   <Target Name="RunApiCompat"
           Condition="'@(ApiCompatProject)' != ''"

From 050925cf21f67413f6a28754c949fd04f9a0a270 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <laakinri@microsoft.com>
Date: Tue, 4 Aug 2020 07:38:04 -0700
Subject: [PATCH 8/8] Address review feedback

---
 eng/illink.targets                           | 14 +++++++-------
 src/libraries/Directory.Build.props          |  4 ----
 src/libraries/illink-sharedframework.targets |  4 ++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index 4d76c0718db33..682871ebc72b0 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -184,17 +184,11 @@
     </PropertyGroup>
   </Target>
 
-  <!-- ILLink.Tasks arguments common to runs for both individual libraries' and for the entire runtime pack -->
+  <!-- ILLink.Tasks arguments common to runs for both individual libraries and for the entire runtime pack -->
   <Target Name="SetCommonILLinkArgs">
     <PropertyGroup>
       <!-- keep type-forward assemblies (facades) -->
       <ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs>
-      <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
-      <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
-      <!-- pass the non-embedded root xml file on the command line -->
-      <ILLinkArgs Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''">$(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)"</ILLinkArgs>
-      <!-- don't remove the embedded substitutions xml resource since ILLink may run again on the assembly -->
-      <ILLinkArgs Condition="'$(ILLinkSubstitutionsXml)' != ''">$(ILLinkArgs) --strip-substitutions false</ILLinkArgs>
       <!-- don't remove the embedded link attributes xml resource since ILLink may run again on the assembly -->
       <!-- and ignore the link attributes xml file during the library build, since we need the attributes preserved until the final app is linked -->
       <ILLinkArgs>$(ILLinkArgs) --strip-link-attributes false --ignore-link-attributes true</ILLinkArgs>
@@ -222,6 +216,12 @@
       <!-- trim the target assembly -->
       <ILLinkArgs>$(ILLinkArgs) -p link $(TargetName)</ILLinkArgs>
       <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
+      <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
+      <ILLinkArgs Condition="'$(ILLinkTrimXml)' != ''">$(ILLinkArgs) --strip-descriptors false</ILLinkArgs>
+      <!-- pass the non-embedded root xml file on the command line -->
+      <ILLinkArgs Condition="'$(ILLinkTrimXmlLibraryBuild)' != ''">$(ILLinkArgs) -x "$(ILLinkTrimXmlLibraryBuild)"</ILLinkArgs>
+      <!-- don't remove the embedded substitutions xml resource since ILLink may run again on the assembly -->
+      <ILLinkArgs Condition="'$(ILLinkSubstitutionsXml)' != ''">$(ILLinkArgs) --strip-substitutions false</ILLinkArgs>
       <!-- keep DynamicDependencyAttribute unless a project explicitly disables it -->
       <ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
       <!-- suppress warnings with the following codes:
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index fa087cfc37cce..98097c8ab3188 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -329,8 +329,4 @@
     <CLSCompliant Condition="'$(CLSCompliant)' == ''">true</CLSCompliant>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <LibrariesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-runtimepack'))</LibrariesTrimmedArtifactsPath>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets
index d4b1aa79c3236..9ccc5a2ec850f 100644
--- a/src/libraries/illink-sharedframework.targets
+++ b/src/libraries/illink-sharedframework.targets
@@ -4,6 +4,10 @@
           AfterTargets="Build"
           DependsOnTargets="SetCommonILLinkArgs">
 
+    <PropertyGroup>
+      <LibrariesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(BuildSettings)', 'trimmed-runtimepack'))</LibrariesTrimmedArtifactsPath>
+    </PropertyGroup>
+
     <PropertyGroup>
       <!-- default action for core assemblies -->
       <ILLinkArgs>$(ILLinkArgs) -c link</ILLinkArgs>