Fix server trim error from dependency injection

src/Grpc.AspNetCore.Server/GrpcEndpointRouteBuilderExtensions.cs

@@ -30,10 +30,6 @@ namespace Microsoft.AspNetCore.Builder
     /// </summary>
     public static class GrpcEndpointRouteBuilderExtensions
     {
-#if NET5_0_OR_GREATER
-        private const DynamicallyAccessedMemberTypes ServiceAccessibility = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
-#endif
-
         /// <summary>
         /// Maps incoming requests to the specified <typeparamref name="TService"/> type.
         /// </summary>
@@ -42,7 +38,7 @@ public static class GrpcEndpointRouteBuilderExtensions
         /// <returns>A <see cref="GrpcServiceEndpointConventionBuilder"/> for endpoints associated with the service.</returns>
         public static GrpcServiceEndpointConventionBuilder MapGrpcService<
 #if NET5_0_OR_GREATER
-            [DynamicallyAccessedMembers(ServiceAccessibility)]
+            [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
 #endif
             TService>(this IEndpointRouteBuilder builder) where TService : class
         {

src/Grpc.AspNetCore.Server/IGrpcServiceActivator.cs

@@ -17,15 +17,21 @@
 #endregion
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
+using Grpc.AspNetCore.Server.Internal;
 
 namespace Grpc.AspNetCore.Server
 {
     /// <summary>
     /// A <typeparamref name="TGrpcService"/> activator abstraction.
     /// </summary>
     /// <typeparam name="TGrpcService">The service type.</typeparam>
-    public interface IGrpcServiceActivator<TGrpcService> where TGrpcService : class
+    public interface IGrpcServiceActivator<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TGrpcService> where TGrpcService : class
     {
         /// <summary>
         /// Creates a service.

src/Grpc.AspNetCore.Server/Internal/CallHandlers/ClientStreamingServerCallHandler.cs

@@ -16,6 +16,7 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Grpc.Core;
 using Grpc.Shared.Server;
@@ -24,7 +25,11 @@
 
 namespace Grpc.AspNetCore.Server.Internal.CallHandlers
 {
-    internal class ClientStreamingServerCallHandler<TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
+    internal class ClientStreamingServerCallHandler<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class

src/Grpc.AspNetCore.Server/Internal/CallHandlers/DuplexStreamingServerCallHandler.cs

@@ -17,6 +17,7 @@
 #endregion
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
@@ -27,7 +28,11 @@
 
 namespace Grpc.AspNetCore.Server.Internal.CallHandlers
 {
-    internal class DuplexStreamingServerCallHandler<TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
+    internal class DuplexStreamingServerCallHandler<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class

src/Grpc.AspNetCore.Server/Internal/CallHandlers/ServerCallHandlerBase.cs

@@ -17,8 +17,8 @@
 #endregion
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Grpc.Shared.Server;
 using Microsoft.AspNetCore.Http;
@@ -29,7 +29,11 @@
 
 namespace Grpc.AspNetCore.Server.Internal.CallHandlers
 {
-    internal abstract class ServerCallHandlerBase<TService, TRequest, TResponse>
+    internal abstract class ServerCallHandlerBase<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse>
         where TService : class
         where TRequest : class
         where TResponse : class

src/Grpc.AspNetCore.Server/Internal/CallHandlers/ServerStreamingServerCallHandler.cs

@@ -16,18 +16,19 @@
 
 #endregion
 
-using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Grpc.AspNetCore.Server.Model;
-using Grpc.Core;
 using Grpc.Shared.Server;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Grpc.AspNetCore.Server.Internal.CallHandlers
 {
-    internal class ServerStreamingServerCallHandler<TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
+    internal class ServerStreamingServerCallHandler<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class

src/Grpc.AspNetCore.Server/Internal/CallHandlers/UnaryServerCallHandler.cs

@@ -16,18 +16,20 @@
 
 #endregion
 
-using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Grpc.Shared.Server;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Grpc.AspNetCore.Server.Internal.CallHandlers
 {
-    internal class UnaryServerCallHandler<TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
+    internal class UnaryServerCallHandler<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse> : ServerCallHandlerBase<TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class

src/Grpc.AspNetCore.Server/Internal/DefaultGrpcServiceActivator.cs

@@ -25,13 +25,10 @@ namespace Grpc.AspNetCore.Server.Internal
 {
     internal sealed class DefaultGrpcServiceActivator<
 #if NET5_0_OR_GREATER
-        [DynamicallyAccessedMembers(ServiceAccessibility)]
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
 #endif
         TGrpcService> : IGrpcServiceActivator<TGrpcService> where TGrpcService : class
     {
-#if NET5_0_OR_GREATER
-        internal const DynamicallyAccessedMemberTypes ServiceAccessibility = DynamicallyAccessedMemberTypes.PublicConstructors;
-#endif
         private static readonly Lazy<ObjectFactory> _objectFactory = new Lazy<ObjectFactory>(static () => ActivatorUtilities.CreateFactory(typeof(TGrpcService), Type.EmptyTypes));
 
         public GrpcActivatorHandle<TGrpcService> Create(IServiceProvider serviceProvider)

src/Grpc.AspNetCore.Server/Internal/GrpcProtocolConstants.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Net.Http.Headers;
@@ -127,5 +128,9 @@ internal static int GetCancelErrorCode(string protocol)
             return Http2ResetStreamCancel;
 #endif
         }
+
+#if NET5_0_OR_GREATER
+        internal const DynamicallyAccessedMemberTypes ServiceAccessibility = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
+#endif
     }
 }

src/Grpc.AspNetCore.Server/Internal/ServerCallHandlerFactory.cs

@@ -17,6 +17,7 @@
 #endregion
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Grpc.AspNetCore.Server.Internal.CallHandlers;
 using Grpc.AspNetCore.Server.Model;
@@ -32,7 +33,11 @@ namespace Grpc.AspNetCore.Server.Internal
     /// <summary>
     /// Creates server call handlers. Provides a place to get services that call handlers will use.
     /// </summary>
-    internal partial class ServerCallHandlerFactory<TService> where TService : class
+    internal partial class ServerCallHandlerFactory<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService> where TService : class
     {
         private readonly ILoggerFactory _loggerFactory;
         private readonly IGrpcServiceActivator<TService> _serviceActivator;

src/Grpc.AspNetCore.Server/Model/IServiceMethodProvider.cs

@@ -16,6 +16,9 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
+using Grpc.AspNetCore.Server.Internal;
+
 namespace Grpc.AspNetCore.Server.Model
 {
     /// <summary>
@@ -28,7 +31,11 @@ namespace Grpc.AspNetCore.Server.Model
     /// <see cref="IServiceMethodProvider{TService}"/> instances are invoked in the order they are registered.
     /// </para>
     /// </remarks>
-    public interface IServiceMethodProvider<TService> where TService : class
+    public interface IServiceMethodProvider<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService> where TService : class
     {
         /// <summary>
         /// Called to execute the provider.

src/Grpc.AspNetCore.Server/Model/Internal/BinderServiceModelProvider.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.Shared.Server;
 using Microsoft.Extensions.Logging;
 using Log = Grpc.AspNetCore.Server.Model.Internal.BinderServiceMethodProviderLog;
@@ -26,7 +27,7 @@ namespace Grpc.AspNetCore.Server.Model.Internal
 {
     internal class BinderServiceMethodProvider<
 #if NET5_0_OR_GREATER
-        [DynamicallyAccessedMembers(ProviderServiceBinder<TService>.ServiceAccessibility)]
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
 #endif
         TService> : IServiceMethodProvider<TService> where TService : class
     {

src/Grpc.AspNetCore.Server/Model/Internal/ProviderServiceBinder.cs

@@ -20,22 +20,18 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.Core;
 using Microsoft.AspNetCore.Routing;
 
 namespace Grpc.AspNetCore.Server.Model.Internal
 {
     internal class ProviderServiceBinder<
 #if NET5_0_OR_GREATER
-        [DynamicallyAccessedMembers(ServiceAccessibility)]
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
 #endif
         TService> : ServiceBinderBase where TService : class
     {
-#if NET5_0_OR_GREATER
-        // Non-public methods is required by GetMethod overload that has a BindingFlags argument.
-        internal const DynamicallyAccessedMemberTypes ServiceAccessibility = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
-#endif
-
         private readonly ServiceMethodProviderContext<TService> _context;
         private readonly Type _declaringType;
 

src/Grpc.AspNetCore.Server/Model/Internal/ServiceRouteBuilder.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Grpc.AspNetCore.Server.Internal;
 using Grpc.Core;
@@ -31,7 +32,11 @@
 
 namespace Grpc.AspNetCore.Server.Model.Internal
 {
-    internal class ServiceRouteBuilder<TService> where TService : class
+    internal class ServiceRouteBuilder<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService> where TService : class
     {
         private readonly IEnumerable<IServiceMethodProvider<TService>> _serviceMethodProviders;
         private readonly ServerCallHandlerFactory<TService> _serverCallHandlerFactory;

src/Grpc.AspNetCore.Server/Model/ServiceMethodProviderContext.cs

@@ -17,6 +17,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Grpc.AspNetCore.Server.Internal;
 using Grpc.AspNetCore.Server.Model.Internal;
 using Grpc.Core;
@@ -29,7 +30,11 @@ namespace Grpc.AspNetCore.Server.Model
     /// A context for <see cref="IServiceMethodProvider{TService}"/>.
     /// </summary>
     /// <typeparam name="TService">Service type for the context.</typeparam>
-    public class ServiceMethodProviderContext<TService> where TService : class
+    public class ServiceMethodProviderContext<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService> where TService : class
     {
         private readonly ServerCallHandlerFactory<TService> _serverCallHandlerFactory;
 

src/Shared/Server/ClientStreamingServerMethodInvoker.cs

@@ -16,8 +16,10 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Grpc.AspNetCore.Server;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Microsoft.AspNetCore.Http;
@@ -30,7 +32,11 @@ namespace Grpc.Shared.Server
     /// <typeparam name="TService">Service type for this method.</typeparam>
     /// <typeparam name="TRequest">Request message type for this method.</typeparam>
     /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-    internal sealed class ClientStreamingServerMethodInvoker<TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
+    internal sealed class ClientStreamingServerMethodInvoker<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class

src/Shared/Server/DuplexStreamingServerMethodInvoker.cs

@@ -16,8 +16,10 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Grpc.AspNetCore.Server;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Microsoft.AspNetCore.Http;
@@ -30,7 +32,11 @@ namespace Grpc.Shared.Server
     /// <typeparam name="TService">Service type for this method.</typeparam>
     /// <typeparam name="TRequest">Request message type for this method.</typeparam>
     /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-    internal sealed class DuplexStreamingServerMethodInvoker<TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
+    internal sealed class DuplexStreamingServerMethodInvoker<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class

src/Shared/Server/ServerMethodInvokerBase.cs

@@ -16,7 +16,9 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using Grpc.AspNetCore.Server;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.Core;
 
 namespace Grpc.Shared.Server
@@ -27,7 +29,11 @@ namespace Grpc.Shared.Server
     /// <typeparam name="TService">Service type for this method.</typeparam>
     /// <typeparam name="TRequest">Request message type for this method.</typeparam>
     /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-    internal abstract class ServerMethodInvokerBase<TService, TRequest, TResponse>
+    internal abstract class ServerMethodInvokerBase<
+#if NET5_0_OR_GREATER
+        [DynamicallyAccessedMembers(GrpcProtocolConstants.ServiceAccessibility)]
+#endif
+        TService, TRequest, TResponse>
         where TRequest : class
         where TResponse : class
         where TService : class