From 38cd1d64b5c4fba03a8d9799fe21f978cecad5a5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 25 Oct 2021 19:00:31 +0200
Subject: [PATCH] Don't trim PNSE assemblies and enable trimming for inbox
 assets on all .NETCoreApp versions (#58345)

* Don't trim PNSE assemblies

Don't trim platform not supported assemblies, since even in "library" trimming mode, the trimmer might remove some non-public members if they are not called within the assembly. In the case of PNSE assemblies this is most likely always the case.
---
 src/libraries/Directory.Build.targets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 362a93ebef916..89636077e7ca7 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -48,6 +48,13 @@
                                                   '$(DisableImplicitFrameworkReferences)' != 'true' and
                                                   '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
                                                   ('$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true')">true</DisableImplicitAssemblyReferences>
+    <!-- Enable trimming for any source project that's part of the shared framework.
+         Don't attempt to trim PNSE assemblies which are generated from the reference source. -->
+    <ILLinkTrimAssembly Condition="'$(ILLinkTrimAssembly)' == '' and
+                                   '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
+                                   '$(IsNETCoreAppSrc)' == 'true' and
+                                   '$(GeneratePlatformNotSupportedAssembly)' != 'true' and
+                                   '$(GeneratePlatformNotSupportedAssemblyMessage)' == ''">true</ILLinkTrimAssembly>
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)versioning.targets" />
@@ -82,13 +89,6 @@
       <RuntimePath>$(NetCoreAppCurrentRuntimePath)</RuntimePath>
     </BinPlaceTargetFrameworks>
 
-    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"
-                              Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
-      <!-- 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>
-    </BinPlaceTargetFrameworks>
     <BinPlaceDir Include="$(MicrosoftNetCoreAppRefPackDir)analyzers\dotnet\$(AnalyzerLanguage)"
                  Condition="'$(IsNETCoreAppAnalyzer)' == 'true'" />