Deprecate IActionContextAccessor

src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs

@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure;
 /// <summary>
 /// Type that provides access to an <see cref="ActionContext"/>.
 /// </summary>
+[Obsolete("ActionContextAccessor is obsolete. Use IHttpContextAccessor instead and access the endpoint information from HttpContext.GetEndpoint(). This type will be removed in a future version.", DiagnosticId = "ASPDEPR004")]
 public class ActionContextAccessor : IActionContextAccessor
 {
     internal static readonly IActionContextAccessor Null = new NullActionContextAccessor();

src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs

@@ -30,7 +30,9 @@ internal partial class ControllerActionInvoker : ResourceInvoker, IActionInvoker
     internal ControllerActionInvoker(
         ILogger logger,
         DiagnosticListener diagnosticListener,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor actionContextAccessor,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         IActionResultTypeMapper mapper,
         ControllerContext controllerContext,
         ControllerActionInvokerCacheEntry cacheEntry,

src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs

@@ -23,7 +23,9 @@ internal sealed class ControllerActionInvokerProvider : IActionInvokerProvider
     private readonly ILogger _logger;
     private readonly DiagnosticListener _diagnosticListener;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
     public ControllerActionInvokerProvider(
         ControllerActionInvokerCache controllerActionInvokerCache,
@@ -41,7 +43,9 @@ public ControllerActionInvokerProvider(
         ILoggerFactory loggerFactory,
         DiagnosticListener diagnosticListener,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor)
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     {
         _controllerActionInvokerCache = controllerActionInvokerCache;
         _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
@@ -51,7 +55,9 @@ public ControllerActionInvokerProvider(
         _logger = loggerFactory.CreateLogger(typeof(ControllerActionInvoker));
         _diagnosticListener = diagnosticListener;
         _mapper = mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public int Order => -1000;

src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs

@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure;
 /// <summary>
 /// Defines an interface for exposing an <see cref="ActionContext"/>.
 /// </summary>
+[Obsolete("IActionContextAccessor is obsolete. Use IHttpContextAccessor instead and access the endpoint information from HttpContext.GetEndpoint(). This type will be removed in a future version.", DiagnosticId = "ASPDEPR004")]
 public interface IActionContextAccessor
 {
     /// <summary>

src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs

@@ -15,7 +15,9 @@ internal abstract partial class ResourceInvoker
 {
     protected readonly DiagnosticListener _diagnosticListener;
     protected readonly ILogger _logger;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     protected readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     protected readonly IActionResultTypeMapper _mapper;
     protected readonly ActionContext _actionContext;
     protected readonly IFilterMetadata[] _filters;
@@ -37,7 +39,9 @@ internal abstract partial class ResourceInvoker
     public ResourceInvoker(
         DiagnosticListener diagnosticListener,
         ILogger logger,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor actionContextAccessor,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         IActionResultTypeMapper mapper,
         ActionContext actionContext,
         IFilterMetadata[] filters,

src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs

@@ -24,7 +24,9 @@ internal sealed class ControllerRequestDelegateFactory : IRequestDelegateFactory
     private readonly ILogger _logger;
     private readonly DiagnosticListener _diagnosticListener;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     private readonly bool _enableActionInvokers;
 
     public ControllerRequestDelegateFactory(
@@ -43,7 +45,9 @@ public ControllerRequestDelegateFactory(
         ILoggerFactory loggerFactory,
         DiagnosticListener diagnosticListener,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor)
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     {
         _controllerActionInvokerCache = controllerActionInvokerCache;
         _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
@@ -54,7 +58,9 @@ public ControllerRequestDelegateFactory(
         _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
         _diagnosticListener = diagnosticListener;
         _mapper = mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public RequestDelegate? CreateRequestDelegate(ActionDescriptor actionDescriptor, RouteValueDictionary? dataTokens)

src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs

@@ -398,7 +398,9 @@ public TestControllerActionInvoker(
             : base(
                   logger,
                   diagnosticListener,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
                   ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
                   mapper,
                   CreateControllerContext(actionContext, valueProviderFactories, maxAllowedErrorsInModelState),
                   CreateCacheEntry((ControllerActionDescriptor)actionContext.ActionDescriptor, controllerFactory),

src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs

@@ -1432,7 +1432,9 @@ public async Task Invoke_UsesDefaultValuesIfNotBound()
         var invoker = new ControllerActionInvoker(
             new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
             new DiagnosticListener("Microsoft.AspNetCore"),
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
             ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
             new ActionResultTypeMapper(),
             controllerContext,
             cacheEntry,
@@ -1769,7 +1771,9 @@ private ControllerActionInvoker CreateInvoker(
         var invoker = new ControllerActionInvoker(
             logger,
             diagnosticSource,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
             ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
             new ActionResultTypeMapper(),
             controllerContext,
             cacheEntry,

src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs

@@ -35,7 +35,9 @@ public PageActionInvoker(
         IPageHandlerMethodSelector handlerMethodSelector,
         DiagnosticListener diagnosticListener,
         ILogger logger,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor actionContextAccessor,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         IActionResultTypeMapper mapper,
         PageContext pageContext,
         IFilterMetadata[] filterMetadata,

src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs

@@ -25,7 +25,9 @@ internal sealed class PageActionInvokerProvider : IActionInvokerProvider
     private readonly DiagnosticListener _diagnosticListener;
     private readonly ILogger<PageActionInvoker> _logger;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
     public PageActionInvokerProvider(
         PageLoader pageLoader,
@@ -38,7 +40,9 @@ public PageActionInvokerProvider(
         DiagnosticListener diagnosticListener,
         ILoggerFactory loggerFactory,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor = null)
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     {
         _pageLoader = pageLoader;
         _pageActionInvokerCache = pageActionInvokerCache;
@@ -50,7 +54,9 @@ public PageActionInvokerProvider(
         _diagnosticListener = diagnosticListener;
         _logger = loggerFactory.CreateLogger<PageActionInvoker>();
         _mapper = mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     // For testing

src/Mvc/Mvc.RazorPages/src/Infrastructure/PageRequestDelegateFactory.cs

@@ -26,7 +26,9 @@ internal sealed class PageRequestDelegateFactory : IRequestDelegateFactory
     private readonly DiagnosticListener _diagnosticListener;
     private readonly ILogger<PageActionInvoker> _logger;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     private readonly bool _enableActionInvokers;
 
     public PageRequestDelegateFactory(
@@ -53,7 +55,9 @@ public PageRequestDelegateFactory(
         DiagnosticListener diagnosticListener,
         ILoggerFactory loggerFactory,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor)
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     {
         _cache = cache;
         _valueProviderFactories = mvcOptions.Value.ValueProviderFactories.ToArray();
@@ -65,7 +69,9 @@ public PageRequestDelegateFactory(
         _diagnosticListener = diagnosticListener;
         _logger = loggerFactory.CreateLogger<PageActionInvoker>();
         _mapper = mapper;
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public RequestDelegate? CreateRequestDelegate(ActionDescriptor actionDescriptor, RouteValueDictionary? dataTokens)

src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs

@@ -1565,7 +1565,9 @@ object pageFactory(PageContext context, ViewContext viewContext)
             selector.Object,
             diagnosticListener ?? new DiagnosticListener("Microsoft.AspNetCore"),
             logger ?? NullLogger.Instance,
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
             ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
             new ActionResultTypeMapper(),
             pageContext,
             filters ?? Array.Empty<IFilterMetadata>(),

src/Mvc/test/WebSites/BasicWebSite/Startup.cs

@@ -20,7 +20,9 @@ public void ConfigureServices(IServiceCollection services)
         services.AddHttpContextAccessor();
         services.AddScoped<RequestIdService>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public void Configure(IApplicationBuilder app)

src/Mvc/test/WebSites/BasicWebSite/StartupWithoutEndpointRouting.cs

@@ -49,7 +49,9 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<RequestIdService>();
         services.AddTransient<ServiceActionFilter>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         services.TryAddSingleton(CreateWeatherForecastService);
     }
 

src/Mvc/test/WebSites/Common/TestResponseGenerator.cs

@@ -12,7 +12,9 @@ public class TestResponseGenerator
 {
     private readonly ActionContext _actionContext;
 
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     public TestResponseGenerator(IActionContextAccessor contextAccessor)
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     {
         _actionContext = contextAccessor.ActionContext;
         if (_actionContext == null)

src/Mvc/test/WebSites/GenericHostWebSite/Startup.cs

@@ -23,7 +23,9 @@ public void ConfigureServices(IServiceCollection services)
         services.AddLogging();
         services.AddHttpContextAccessor();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public void Configure(IApplicationBuilder app)

src/Mvc/test/WebSites/RoutingWebSite/Startup.cs

@@ -29,7 +29,9 @@ public void ConfigureServices(IServiceCollection services)
         ConfigureRoutingServices(services);
 
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)

src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamic.cs

@@ -18,7 +18,9 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddTransient<Transformer>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         // Used by some controllers defined in this project.
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));

src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamicOrder.cs

@@ -33,7 +33,9 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddTransient<Transformer>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         // Used by some controllers defined in this project.
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));

src/Mvc/test/WebSites/RoutingWebSite/StartupForEndpointFilters.cs

@@ -17,7 +17,9 @@ public void ConfigureServices(IServiceCollection services)
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
         services.AddScoped<TestResponseGenerator>();
         // This is used by test response generator
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)

src/Mvc/test/WebSites/RoutingWebSite/StartupForFallback.cs

@@ -16,7 +16,9 @@ public void ConfigureServices(IServiceCollection services)
             .AddNewtonsoftJson();
 
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         // Used by some controllers defined in this project.
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));

src/Mvc/test/WebSites/RoutingWebSite/StartupForGroups.cs

@@ -17,7 +17,9 @@ public void ConfigureServices(IServiceCollection services)
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
         services.AddScoped<TestResponseGenerator>();
         // This is used by test response generator
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)

src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs

@@ -31,7 +31,9 @@ public void ConfigureServices(IServiceCollection services)
             });
 
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public void Configure(IApplicationBuilder app)

src/Mvc/test/WebSites/RoutingWebSite/StartupRoutingDifferentBranches.cs

@@ -31,7 +31,9 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddScoped<TestResponseGenerator>();
         // This is used by test response generator
+        #pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<BranchesTransformer>();
     }
 

src/Mvc/test/WebSites/VersioningWebSite/Startup.cs

@@ -14,7 +14,9 @@ public void ConfigureServices(IServiceCollection services)
             .AddNewtonsoftJson();
 
         services.AddScoped<TestResponseGenerator>();
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)