Skip to content

Commit f287675

Browse files
Copilotcaptainsafia
Copilot
and
captainsafia
committed
Update obsolete attributes to use diagnostic ID ASPDEPR006 and updated message with URL
Co-authored-by: captainsafia <[email protected]>
1 parent da6d7f4 commit f287675

25 files changed

+68
-68
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure;
1010
/// <summary>
1111
/// Type that provides access to an <see cref="ActionContext"/>.
1212
/// </summary>
13-
[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")]
13+
[Obsolete("ActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006")]
1414
public class ActionContextAccessor : IActionContextAccessor
1515
{
1616
internal static readonly IActionContextAccessor Null = new NullActionContextAccessor();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ internal partial class ControllerActionInvoker : ResourceInvoker, IActionInvoker
3030
internal ControllerActionInvoker(
3131
ILogger logger,
3232
DiagnosticListener diagnosticListener,
33-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
33+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
3434
IActionContextAccessor actionContextAccessor,
35-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
35+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
3636
IActionResultTypeMapper mapper,
3737
ControllerContext controllerContext,
3838
ControllerActionInvokerCacheEntry cacheEntry,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ internal sealed class ControllerActionInvokerProvider : IActionInvokerProvider
2323
private readonly ILogger _logger;
2424
private readonly DiagnosticListener _diagnosticListener;
2525
private readonly IActionResultTypeMapper _mapper;
26-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
26+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
2727
private readonly IActionContextAccessor _actionContextAccessor;
28-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
28+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
2929

3030
public ControllerActionInvokerProvider(
3131
ControllerActionInvokerCache controllerActionInvokerCache,
@@ -43,9 +43,9 @@ public ControllerActionInvokerProvider(
4343
ILoggerFactory loggerFactory,
4444
DiagnosticListener diagnosticListener,
4545
IActionResultTypeMapper mapper,
46-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
46+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
4747
IActionContextAccessor? actionContextAccessor)
48-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
48+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
4949
{
5050
_controllerActionInvokerCache = controllerActionInvokerCache;
5151
_valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
@@ -55,9 +55,9 @@ public ControllerActionInvokerProvider(
5555
_logger = loggerFactory.CreateLogger(typeof(ControllerActionInvoker));
5656
_diagnosticListener = diagnosticListener;
5757
_mapper = mapper;
58-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
58+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
5959
_actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
60-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
60+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
6161
}
6262

6363
public int Order => -1000;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure;
1010
/// <summary>
1111
/// Defines an interface for exposing an <see cref="ActionContext"/>.
1212
/// </summary>
13-
[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")]
13+
[Obsolete("IActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006")]
1414
public interface IActionContextAccessor
1515
{
1616
/// <summary>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ internal abstract partial class ResourceInvoker
1515
{
1616
protected readonly DiagnosticListener _diagnosticListener;
1717
protected readonly ILogger _logger;
18-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
18+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
1919
protected readonly IActionContextAccessor _actionContextAccessor;
20-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
20+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
2121
protected readonly IActionResultTypeMapper _mapper;
2222
protected readonly ActionContext _actionContext;
2323
protected readonly IFilterMetadata[] _filters;
@@ -39,9 +39,9 @@ internal abstract partial class ResourceInvoker
3939
public ResourceInvoker(
4040
DiagnosticListener diagnosticListener,
4141
ILogger logger,
42-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
42+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
4343
IActionContextAccessor actionContextAccessor,
44-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
44+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
4545
IActionResultTypeMapper mapper,
4646
ActionContext actionContext,
4747
IFilterMetadata[] filters,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ internal sealed class ControllerRequestDelegateFactory : IRequestDelegateFactory
2424
private readonly ILogger _logger;
2525
private readonly DiagnosticListener _diagnosticListener;
2626
private readonly IActionResultTypeMapper _mapper;
27-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
27+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
2828
private readonly IActionContextAccessor _actionContextAccessor;
29-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
29+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
3030
private readonly bool _enableActionInvokers;
3131

3232
public ControllerRequestDelegateFactory(
@@ -45,9 +45,9 @@ public ControllerRequestDelegateFactory(
4545
ILoggerFactory loggerFactory,
4646
DiagnosticListener diagnosticListener,
4747
IActionResultTypeMapper mapper,
48-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
48+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
4949
IActionContextAccessor? actionContextAccessor)
50-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
50+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
5151
{
5252
_controllerActionInvokerCache = controllerActionInvokerCache;
5353
_valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
@@ -58,9 +58,9 @@ public ControllerRequestDelegateFactory(
5858
_logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
5959
_diagnosticListener = diagnosticListener;
6060
_mapper = mapper;
61-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
61+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
6262
_actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
63-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
63+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
6464
}
6565

6666
public RequestDelegate? CreateRequestDelegate(ActionDescriptor actionDescriptor, RouteValueDictionary? dataTokens)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,9 @@ public TestControllerActionInvoker(
398398
: base(
399399
logger,
400400
diagnosticListener,
401-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
401+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
402402
ActionContextAccessor.Null,
403-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
403+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
404404
mapper,
405405
CreateControllerContext(actionContext, valueProviderFactories, maxAllowedErrorsInModelState),
406406
CreateCacheEntry((ControllerActionDescriptor)actionContext.ActionDescriptor, controllerFactory),

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,9 +1432,9 @@ public async Task Invoke_UsesDefaultValuesIfNotBound()
14321432
var invoker = new ControllerActionInvoker(
14331433
new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
14341434
new DiagnosticListener("Microsoft.AspNetCore"),
1435-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
1435+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
14361436
ActionContextAccessor.Null,
1437-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
1437+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
14381438
new ActionResultTypeMapper(),
14391439
controllerContext,
14401440
cacheEntry,
@@ -1771,9 +1771,9 @@ private ControllerActionInvoker CreateInvoker(
17711771
var invoker = new ControllerActionInvoker(
17721772
logger,
17731773
diagnosticSource,
1774-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
1774+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
17751775
ActionContextAccessor.Null,
1776-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
1776+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
17771777
new ActionResultTypeMapper(),
17781778
controllerContext,
17791779
cacheEntry,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public PageActionInvoker(
3535
IPageHandlerMethodSelector handlerMethodSelector,
3636
DiagnosticListener diagnosticListener,
3737
ILogger logger,
38-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
38+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
3939
IActionContextAccessor actionContextAccessor,
40-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
40+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
4141
IActionResultTypeMapper mapper,
4242
PageContext pageContext,
4343
IFilterMetadata[] filterMetadata,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ internal sealed class PageActionInvokerProvider : IActionInvokerProvider
2525
private readonly DiagnosticListener _diagnosticListener;
2626
private readonly ILogger<PageActionInvoker> _logger;
2727
private readonly IActionResultTypeMapper _mapper;
28-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
28+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
2929
private readonly IActionContextAccessor _actionContextAccessor;
30-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
30+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
3131

3232
public PageActionInvokerProvider(
3333
PageLoader pageLoader,
@@ -40,9 +40,9 @@ public PageActionInvokerProvider(
4040
DiagnosticListener diagnosticListener,
4141
ILoggerFactory loggerFactory,
4242
IActionResultTypeMapper mapper,
43-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
43+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
4444
IActionContextAccessor? actionContextAccessor = null)
45-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
45+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
4646
{
4747
_pageLoader = pageLoader;
4848
_pageActionInvokerCache = pageActionInvokerCache;
@@ -54,9 +54,9 @@ public PageActionInvokerProvider(
5454
_diagnosticListener = diagnosticListener;
5555
_logger = loggerFactory.CreateLogger<PageActionInvoker>();
5656
_mapper = mapper;
57-
#pragma warning disable ASPDEPR004 // Type or member is obsolete
57+
#pragma warning disable ASPDEPR006 // Type or member is obsolete
5858
_actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
59-
#pragma warning restore ASPDEPR004 // Type or member is obsolete
59+
#pragma warning restore ASPDEPR006 // Type or member is obsolete
6060
}
6161

6262
// For testing

0 commit comments

Comments
 (0)