From f94bdd013d042f2e0689112d5db640d29132f632 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 20 Jan 2023 06:48:51 +0800
Subject: [PATCH 1/3] Trimming issue workaround in .NET 8

---
 Directory.Build.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6aa77a16b..784d26f35 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -20,6 +20,10 @@
 
     <IsTrimmable>true</IsTrimmable>
     <EnableAOTAnalyzer>true</EnableAOTAnalyzer>
+
+    <!-- .NET 8 issue. Unable to trim netstandard2.1 projects. See https://github.com/dotnet/linker/issues/3175 -->
+    <!-- TODO: Don't use SDK's trimming functionality. Revert once fixed in linker/SDK -->
+    <_IsTrimmingEnabled>false</_IsTrimmingEnabled>
   </PropertyGroup>
 
   <!-- IsGrpcPublishedPackage is set in csproj so related config must be in targets file -->

From b2975eee3e5ffe436cd2b958241aea8381b998d9 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 20 Jan 2023 07:42:47 +0800
Subject: [PATCH 2/3] Use ASP.NET Core workaround

---
 Directory.Build.targets | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 784d26f35..b6c44c994 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -20,10 +20,6 @@
 
     <IsTrimmable>true</IsTrimmable>
     <EnableAOTAnalyzer>true</EnableAOTAnalyzer>
-
-    <!-- .NET 8 issue. Unable to trim netstandard2.1 projects. See https://github.com/dotnet/linker/issues/3175 -->
-    <!-- TODO: Don't use SDK's trimming functionality. Revert once fixed in linker/SDK -->
-    <_IsTrimmingEnabled>false</_IsTrimmingEnabled>
   </PropertyGroup>
 
   <!-- IsGrpcPublishedPackage is set in csproj so related config must be in targets file -->
@@ -34,4 +30,18 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
+  <!-- 
+    Make a netstandard2.1 copy of the .net ILLinkPack to work around a trimming issue.
+    See https://github.com/dotnet/linker/issues/3175
+  -->
+  <Target Name="_FixKnownILLinkPack"
+          BeforeTargets="ProcessFrameworkReferences">
+    <ItemGroup>
+      <KnownILLinkPack Include="@(KnownILLinkPack)"
+                       Condition="'%(TargetFramework)' == 'net8.0'"
+                       TargetFramework="netstandard2.1"
+                       ILLinkPackVersion="%(KnownILLinkPack.ILLinkPackVersion)" />
+    </ItemGroup>
+  </Target>
+
 </Project>

From 99b77b95c9efe970606ce4cbc085aa67c60363ff Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 20 Jan 2023 08:19:16 +0800
Subject: [PATCH 3/3] Update Directory.Build.targets

---
 Directory.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index b6c44c994..9f0387b43 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -33,6 +33,7 @@
   <!-- 
     Make a netstandard2.1 copy of the .net ILLinkPack to work around a trimming issue.
     See https://github.com/dotnet/linker/issues/3175
+    TODO: Remove once .NET 8 + trimming + netstandard2.1 is fixed.
   -->
   <Target Name="_FixKnownILLinkPack"
           BeforeTargets="ProcessFrameworkReferences">