From fcf2823f3a7ce0095e6d6b1d323c23a14841e52a Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Tue, 11 Aug 2020 10:39:52 -0700
Subject: [PATCH] Support linking with IHubFilter (#24780)

- Mark AddFilter to make sure constructors don't get erased during aggressive linking
---
 src/SignalR/server/Core/src/HubOptionsExtensions.cs      | 5 +++--
 src/SignalR/server/Core/src/Internal/HubFilterFactory.cs | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/SignalR/server/Core/src/HubOptionsExtensions.cs b/src/SignalR/server/Core/src/HubOptionsExtensions.cs
index 6db3e87e1f..b83d1ec9ea 100644
--- a/src/SignalR/server/Core/src/HubOptionsExtensions.cs
+++ b/src/SignalR/server/Core/src/HubOptionsExtensions.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.SignalR.Internal;
 
 namespace Microsoft.AspNetCore.SignalR
@@ -37,7 +38,7 @@ namespace Microsoft.AspNetCore.SignalR
         /// </summary>
         /// <typeparam name="TFilter">The <see cref="IHubFilter"/> type that will be added to the options.</typeparam>
         /// <param name="options">The options to add a filter to.</param>
-        public static void AddFilter<TFilter>(this HubOptions options) where TFilter : IHubFilter
+        public static void AddFilter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]TFilter>(this HubOptions options) where TFilter : IHubFilter
         {
             _ = options ?? throw new ArgumentNullException(nameof(options));
 
@@ -49,7 +50,7 @@ namespace Microsoft.AspNetCore.SignalR
         /// </summary>
         /// <param name="options">The options to add a filter to.</param>
         /// <param name="filterType">The <see cref="IHubFilter"/> type that will be added to the options.</param>
-        public static void AddFilter(this HubOptions options, Type filterType)
+        public static void AddFilter(this HubOptions options, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type filterType)
         {
             _ = options ?? throw new ArgumentNullException(nameof(options));
             _ = filterType ?? throw new ArgumentNullException(nameof(filterType));
diff --git a/src/SignalR/server/Core/src/Internal/HubFilterFactory.cs b/src/SignalR/server/Core/src/Internal/HubFilterFactory.cs
index 83a17acb2b..91a1b7fb71 100644
--- a/src/SignalR/server/Core/src/Internal/HubFilterFactory.cs
+++ b/src/SignalR/server/Core/src/Internal/HubFilterFactory.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -12,9 +13,11 @@ namespace Microsoft.AspNetCore.SignalR.Internal
     internal class HubFilterFactory : IHubFilter
     {
         private readonly ObjectFactory _objectFactory;
+
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
         private readonly Type _filterType;
 
-        public HubFilterFactory(Type filterType)
+        public HubFilterFactory([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type filterType)
         {
             _objectFactory = ActivatorUtilities.CreateFactory(filterType, Array.Empty<Type>());
             _filterType = filterType;