Skip to content

Commit 461c4ec

Browse files
authored
Update Servers' Obsolete messages and comments (#29275)
1 parent 07a91e3 commit 461c4ec

File tree

10 files changed

+20
-17
lines changed

10 files changed

+20
-17
lines changed

src/Servers/IIS/IIS/src/BadHttpRequestException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Microsoft.AspNetCore.Server.IIS
1010
{
1111
///<inheritdoc/>
12-
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException")]
12+
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException. See https://aka.ms/badhttprequestexception for details.")] // Never remove.
1313
public sealed class BadHttpRequestException : Microsoft.AspNetCore.Http.BadHttpRequestException
1414
{
1515
internal BadHttpRequestException(string message, int statusCode, RequestRejectionReason reason)

src/Servers/IIS/IIS/src/Core/IISServerAuthenticationHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
1212
/// <summary>
1313
/// The default authentication handler with IIS In-Process
1414
/// </summary>
15-
[Obsolete("The IISServerAuthenticationHandler is obsolete and will be removed in a future release.")]
15+
[Obsolete("The IISServerAuthenticationHandler is obsolete and will be removed in a future release.")] // Remove after .NET 6.
1616
public class IISServerAuthenticationHandler : IAuthenticationHandler
1717
{
1818
private HttpContext? _context;

src/Servers/IIS/IIS/src/Core/ThrowingWasUpgradedWriteOnlyStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
1414
/// <remarks>
1515
/// Users should not need to instantiate this class.
1616
/// </remarks>
17-
[Obsolete("The ThrowingWasUpgradedWriteOnlyStream is obsolete and will be removed in a future release.")]
17+
[Obsolete("The ThrowingWasUpgradedWriteOnlyStream is obsolete and will be removed in a future release.")] // Remove after .NET 6.
1818
public class ThrowingWasUpgradedWriteOnlyStream : WriteOnlyStream
1919
{
2020
///<inheritdoc/>

src/Servers/IIS/IIS/src/Core/WrappingStream.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ public override int EndRead(IAsyncResult asyncResult)
107107
public override void EndWrite(IAsyncResult asyncResult)
108108
=> _inner.EndWrite(asyncResult);
109109

110-
[Obsolete("This Remoting API is not supported and throws PlatformNotSupportedException.", DiagnosticId = "SYSLIB0010", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
110+
#pragma warning disable CS0672, SYSLIB0010 // Overrides obsolete member
111111
public override object InitializeLifetimeService()
112112
=> _inner.InitializeLifetimeService();
113+
#pragma warning restore CS0672, SYSLIB0010 // Overrides obsolete member
113114

114115
public override void Close()
115116
=> _inner.Close();

src/Servers/IIS/IIS/src/Core/WriteOnlyStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
1111
/// <summary>
1212
/// A <see cref="Stream"/> which only allows for writes.
1313
/// </summary>
14-
[Obsolete("The WriteOnlyStream is obsolete and will be removed in a future release.")]
14+
[Obsolete("The WriteOnlyStream is obsolete and will be removed in a future release.")] // Remove after .NET 6.
1515
public abstract class WriteOnlyStream : Stream
1616
{
1717
///<inheritdoc/>

src/Servers/IIS/IIS/src/HttpContextExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public static class HttpContextExtensions
2121
/// <c>null</c> if the server does not support the <see cref="IServerVariablesFeature"/> feature.
2222
/// May return null or empty if the variable does not exist or is not set.
2323
/// </returns>
24-
[Obsolete("This is obsolete and will be removed in a future version. Use " + nameof(HttpContextServerVariableExtensions.GetServerVariable) + " instead.")]
24+
[Obsolete("This is obsolete and will be removed in a future version. Use " +
25+
nameof(HttpContextServerVariableExtensions.GetServerVariable) + " instead.")] // Never remove.
2526
public static string? GetIISServerVariable(this HttpContext context, string variableName) =>
2627
context.GetServerVariable(variableName);
2728
}

src/Servers/Kestrel/Core/src/BadHttpRequestException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
1111
/// <summary>
1212
/// An exception thrown when a malformed http request has been received.
1313
/// </summary>
14-
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException")]
14+
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException. See https://aka.ms/badhttprequestexception for details.")] // Never remove.
1515
public sealed class BadHttpRequestException : Microsoft.AspNetCore.Http.BadHttpRequestException
1616
{
1717
internal BadHttpRequestException(string message, int statusCode, RequestRejectionReason reason)

src/Servers/Kestrel/Core/src/Internal/Infrastructure/WrappingStream.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ public override int EndRead(IAsyncResult asyncResult)
107107
public override void EndWrite(IAsyncResult asyncResult)
108108
=> _inner.EndWrite(asyncResult);
109109

110-
[Obsolete("This Remoting API is not supported and throws PlatformNotSupportedException.", DiagnosticId = "SYSLIB0010", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
110+
#pragma warning disable CS0672, SYSLIB0010 // Overrides obsolete member
111111
public override object InitializeLifetimeService()
112112
=> _inner.InitializeLifetimeService();
113+
#pragma warning restore CS0672, SYSLIB0010 // Overrides obsolete member
113114

114115
public override void Close()
115116
=> _inner.Close();

src/Servers/Kestrel/Transport.Libuv/src/LibuvTransportOptions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv
99
/// <summary>
1010
/// Provides programmatic configuration of Libuv transport features.
1111
/// </summary>
12-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
12+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
1313
public class LibuvTransportOptions
1414
{
1515
/// <summary>
@@ -18,7 +18,7 @@ public class LibuvTransportOptions
1818
/// <remarks>
1919
/// Defaults to half of <see cref="Environment.ProcessorCount" /> rounded down and clamped between 1 and 16.
2020
/// </remarks>
21-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
21+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
2222
public int ThreadCount { get; set; } = ProcessorThreadCount;
2323

2424
/// <summary>
@@ -27,7 +27,7 @@ public class LibuvTransportOptions
2727
/// <remarks>
2828
/// Defaults to true.
2929
/// </remarks>
30-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
30+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
3131
public bool NoDelay { get; set; } = true;
3232

3333
/// <summary>
@@ -36,13 +36,13 @@ public class LibuvTransportOptions
3636
/// <remarks>
3737
/// Defaults to 128.
3838
/// </remarks>
39-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
39+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
4040
public int Backlog { get; set; } = 128;
4141

42-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
42+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
4343
public long? MaxReadBufferSize { get; set; } = 1024 * 1024;
4444

45-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
45+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
4646
public long? MaxWriteBufferSize { get; set; } = 64 * 1024;
4747

4848
internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = System.Buffers.SlabMemoryPoolFactory.Create;

src/Servers/Kestrel/Transport.Libuv/src/WebHostBuilderLibuvExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Hosting
1212
/// <summary>
1313
/// Libuv <see cref="IWebHostBuilder"/> extensions.
1414
/// </summary>
15-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
15+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
1616
public static class WebHostBuilderLibuvExtensions
1717
{
1818
/// <summary>
@@ -24,7 +24,7 @@ public static class WebHostBuilderLibuvExtensions
2424
/// <returns>
2525
/// The Microsoft.AspNetCore.Hosting.IWebHostBuilder.
2626
/// </returns>
27-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
27+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
2828
public static IWebHostBuilder UseLibuv(this IWebHostBuilder hostBuilder)
2929
{
3030
return hostBuilder.ConfigureServices(services =>
@@ -45,7 +45,7 @@ public static IWebHostBuilder UseLibuv(this IWebHostBuilder hostBuilder)
4545
/// <returns>
4646
/// The Microsoft.AspNetCore.Hosting.IWebHostBuilder.
4747
/// </returns>
48-
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
48+
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)] // Remove after .NET 6.
4949
public static IWebHostBuilder UseLibuv(this IWebHostBuilder hostBuilder, Action<LibuvTransportOptions> configureOptions)
5050
{
5151
return hostBuilder.UseLibuv().ConfigureServices(services =>

0 commit comments

Comments
 (0)