Revert framework to use IActionContextAccessor internally with ASPDEPR004 pragma disables

Co-authored-by: captainsafia <[email protected]>

Author: Copilot

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

@@ -10,7 +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.")]
+[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,11 +30,14 @@ 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,
         IFilterMetadata[] filters)
-        : base(diagnosticListener, logger, mapper, controllerContext, filters, controllerContext.ValueProviderFactories)
+        : base(diagnosticListener, logger, actionContextAccessor, mapper, controllerContext, filters, controllerContext.ValueProviderFactories)
     {
         ArgumentNullException.ThrowIfNull(cacheEntry);
 

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

@@ -23,13 +23,29 @@ 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,
         IOptions<MvcOptions> optionsAccessor,
         ILoggerFactory loggerFactory,
         DiagnosticListener diagnosticListener,
         IActionResultTypeMapper mapper)
+        : this(controllerActionInvokerCache, optionsAccessor, loggerFactory, diagnosticListener, mapper, null)
+    {
+    }
+
+    public ControllerActionInvokerProvider(
+        ControllerActionInvokerCache controllerActionInvokerCache,
+        IOptions<MvcOptions> optionsAccessor,
+        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();
@@ -39,6 +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;
@@ -64,6 +83,7 @@ public void OnProvidersExecuting(ActionInvokerProviderContext context)
             var invoker = new ControllerActionInvoker(
                 _logger,
                 _diagnosticListener,
+                _actionContextAccessor,
                 _mapper,
                 controllerContext,
                 cacheEntry,

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

@@ -10,7 +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.")]
+[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,6 +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;
@@ -36,13 +39,17 @@ 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,
         IList<IValueProviderFactory> valueProviderFactories)
     {
         _diagnosticListener = diagnosticListener ?? throw new ArgumentNullException(nameof(diagnosticListener));
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        _actionContextAccessor = actionContextAccessor ?? throw new ArgumentNullException(nameof(actionContextAccessor));
         _mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
         _actionContext = actionContext ?? throw new ArgumentNullException(nameof(actionContext));
 
@@ -58,6 +65,7 @@ public virtual Task InvokeAsync()
             return Logged(this);
         }
 
+        _actionContextAccessor.ActionContext = _actionContext;
         var scope = _logger.ActionScope(_actionContext.ActionDescriptor);
 
         Task task;
@@ -92,6 +100,7 @@ static async Task Awaited(ResourceInvoker invoker, Task task, IDisposable? scope
         static async Task Logged(ResourceInvoker invoker)
         {
             var actionContext = invoker._actionContext;
+            invoker._actionContextAccessor.ActionContext = actionContext;
             try
             {
                 var logger = invoker._logger;

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

@@ -24,6 +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(
@@ -32,6 +35,19 @@ public ControllerRequestDelegateFactory(
         ILoggerFactory loggerFactory,
         DiagnosticListener diagnosticListener,
         IActionResultTypeMapper mapper)
+        : this(controllerActionInvokerCache, optionsAccessor, loggerFactory, diagnosticListener, mapper, null)
+    {
+    }
+
+    public ControllerRequestDelegateFactory(
+        ControllerActionInvokerCache controllerActionInvokerCache,
+        IOptions<MvcOptions> optionsAccessor,
+        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();
@@ -42,6 +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)
@@ -81,6 +100,7 @@ public ControllerRequestDelegateFactory(
             var invoker = new ControllerActionInvoker(
                 _logger,
                 _diagnosticListener,
+                _actionContextAccessor,
                 _mapper,
                 controllerContext,
                 cacheEntry,

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

@@ -398,6 +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,6 +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,
@@ -1768,6 +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,6 +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,
@@ -44,6 +47,7 @@ public PageActionInvoker(
         : base(
               diagnosticListener,
               logger,
+              actionContextAccessor,
               mapper,
               pageContext,
               filterMetadata,

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

@@ -25,6 +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,
@@ -36,7 +39,10 @@ public PageActionInvokerProvider(
         IPageHandlerMethodSelector selector,
         DiagnosticListener diagnosticListener,
         ILoggerFactory loggerFactory,
-        IActionResultTypeMapper mapper)
+        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;
@@ -48,6 +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
@@ -87,6 +96,7 @@ public void OnProvidersExecuting(ActionInvokerProviderContext context)
             _selector,
             _diagnosticListener,
             _logger,
+            _actionContextAccessor,
             _mapper,
             pageContext,
             filters,