Update

Author: JamesNK

Directory.Build.targets

@@ -19,10 +19,7 @@
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Grpc.DotNet.ruleset</CodeAnalysisRuleset>
 
     <IsTrimmable>true</IsTrimmable>
-    <!-- Unable to trim netstandard2.1 projects. See https://github.com/dotnet/linker/issues/3175 -->
-    <!-- Don't use SDK's trimming functionality. -->
-    <_IsTrimmingEnabled>false</_IsTrimmingEnabled>
-    <EnableAOTAnalyzer>false</EnableAOTAnalyzer>
+    <EnableAOTAnalyzer>true</EnableAOTAnalyzer>
   </PropertyGroup>
 
   <!-- IsGrpcPublishedPackage is set in csproj so related config must be in targets file -->
@@ -33,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>