Re-enable trim analysis and fix warnings (grpc#1744)

Author: JamesNK

Directory.Build.targets

@@ -19,9 +19,6 @@
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Grpc.DotNet.ruleset</CodeAnalysisRuleset>
 
     <IsTrimmable>true</IsTrimmable>
-    <!-- TODO(JamesNK) Trim anaylzers broken in .NET 7. Impacts benchmark environments that build with .NET 7 SDK. Issue: https://github.com/grpc/grpc-dotnet/issues/1667
-         Reenable when https://github.com/dotnet/linker/issues/2718 is fixed. -->
-    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
   </PropertyGroup>
 
   <!-- IsGrpcPublishedPackage is set in csproj so related config must be in targets file -->

src/Grpc.AspNetCore.Server.Reflection/GrpcReflectionServiceExtensions.cs

@@ -16,6 +16,7 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Grpc.AspNetCore.Server;
 using Grpc.Core;
@@ -120,6 +121,7 @@ public static IServiceCollection AddGrpcReflection(this IServiceCollection servi
             return null;
         }
 
+        [SuppressMessage("Trimming", "IL2075", Justification = "Modern apps published with trimming will be using newer Grpc.Tools and won't use this fallback.")]
         private static PropertyInfo? GetDescriptorPropertyFallback(Type serviceType)
         {
             // Search for the generated service base class

src/Grpc.AspNetCore.Server/GrpcMethodMetadata.cs

@@ -16,6 +16,8 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.Core;
 
 namespace Grpc.AspNetCore.Server
@@ -30,7 +32,12 @@ public sealed class GrpcMethodMetadata
         /// </summary>
         /// <param name="serviceType">The implementing service type.</param>
         /// <param name="method">The method representation.</param>
-        public GrpcMethodMetadata(Type serviceType, IMethod method)
+        public GrpcMethodMetadata(
+#if NET5_0_OR_GREATER
+            [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+            Type serviceType,
+            IMethod method)
         {
             if (serviceType == null)
             {
@@ -49,6 +56,9 @@ public GrpcMethodMetadata(Type serviceType, IMethod method)
         /// <summary>
         /// Gets the implementing service type.
         /// </summary>
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
         public Type ServiceType { get; }
 
         /// <summary>

src/Grpc.Core.Api/BindServiceMethodAttribute.cs

@@ -30,9 +30,10 @@ namespace Grpc.Core
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
     public class BindServiceMethodAttribute : Attribute
     {
-        // grpc-dotnet uses reflection to find the bind service method.
-        // DynamicallyAccessedMembersAttribute instructs the linker to never trim the method.
-        private const DynamicallyAccessedMemberTypes ServiceBinderAccessibility = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
+        // Grpc.AspNetCore.Server uses reflection to find the bind service method.
+        // Grpc.AspNetCore.Server.Reflection uses reflection to find the descriptor property.
+        // DynamicallyAccessedMembersAttribute instructs the linker to never trim the members.
+        private const DynamicallyAccessedMemberTypes ServiceBinderAccessibility = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicProperties;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BindServiceMethodAttribute"/> class.