Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/src/BadHttpRequestException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace Microsoft.AspNetCore.Server.IIS
{
///<inheritdoc/>
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException")]
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException. See https://aka.ms/badhttprequestexception for details.")] // Never remove.
public sealed class BadHttpRequestException : Microsoft.AspNetCore.Http.BadHttpRequestException
{
internal BadHttpRequestException(string message, int statusCode, RequestRejectionReason reason)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
/// <summary>
/// The default authentication handler with IIS In-Process
/// </summary>
[Obsolete("The IISServerAuthenticationHandler is obsolete and will be removed in a future release.")]
[Obsolete("The IISServerAuthenticationHandler is obsolete and will be removed in a future release.")] // Remove after .NET 6.
public class IISServerAuthenticationHandler : IAuthenticationHandler
{
private HttpContext? _context;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
/// <remarks>
/// Users should not need to instantiate this class.
/// </remarks>
[Obsolete("The ThrowingWasUpgradedWriteOnlyStream is obsolete and will be removed in a future release.")]
[Obsolete("The ThrowingWasUpgradedWriteOnlyStream is obsolete and will be removed in a future release.")] // Remove after .NET 6.
public class ThrowingWasUpgradedWriteOnlyStream : WriteOnlyStream
{
///<inheritdoc/>
Expand Down
3 changes: 2 additions & 1 deletion src/Servers/IIS/IIS/src/Core/WrappingStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ public override int EndRead(IAsyncResult asyncResult)
public override void EndWrite(IAsyncResult asyncResult)
=> _inner.EndWrite(asyncResult);

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

public override void Close()
=> _inner.Close();
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/src/Core/WriteOnlyStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
/// <summary>
/// A <see cref="Stream"/> which only allows for writes.
/// </summary>
[Obsolete("The WriteOnlyStream is obsolete and will be removed in a future release.")]
[Obsolete("The WriteOnlyStream is obsolete and will be removed in a future release.")] // Remove after .NET 6.
public abstract class WriteOnlyStream : Stream
{
///<inheritdoc/>
Expand Down
3 changes: 2 additions & 1 deletion src/Servers/IIS/IIS/src/HttpContextExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public static class HttpContextExtensions
/// <c>null</c> if the server does not support the <see cref="IServerVariablesFeature"/> feature.
/// May return null or empty if the variable does not exist or is not set.
/// </returns>
[Obsolete("This is obsolete and will be removed in a future version. Use " + nameof(HttpContextServerVariableExtensions.GetServerVariable) + " instead.")]
[Obsolete("This is obsolete and will be removed in a future version. Use " +
nameof(HttpContextServerVariableExtensions.GetServerVariable) + " instead.")] // Never remove.
public static string? GetIISServerVariable(this HttpContext context, string variableName) =>
context.GetServerVariable(variableName);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/Kestrel/Core/src/BadHttpRequestException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
/// <summary>
/// An exception thrown when a malformed http request has been received.
/// </summary>
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException")]
[Obsolete("Moved to Microsoft.AspNetCore.Http.BadHttpRequestException. See https://aka.ms/badhttprequestexception for details.")] // Never remove.
public sealed class BadHttpRequestException : Microsoft.AspNetCore.Http.BadHttpRequestException
{
internal BadHttpRequestException(string message, int statusCode, RequestRejectionReason reason)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ public override int EndRead(IAsyncResult asyncResult)
public override void EndWrite(IAsyncResult asyncResult)
=> _inner.EndWrite(asyncResult);

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

public override void Close()
=> _inner.Close();
Expand Down
12 changes: 6 additions & 6 deletions src/Servers/Kestrel/Transport.Libuv/src/LibuvTransportOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv
/// <summary>
/// Provides programmatic configuration of Libuv transport features.
/// </summary>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public class LibuvTransportOptions
{
/// <summary>
Expand All @@ -18,7 +18,7 @@ public class LibuvTransportOptions
/// <remarks>
/// Defaults to half of <see cref="Environment.ProcessorCount" /> rounded down and clamped between 1 and 16.
/// </remarks>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public int ThreadCount { get; set; } = ProcessorThreadCount;

/// <summary>
Expand All @@ -27,7 +27,7 @@ public class LibuvTransportOptions
/// <remarks>
/// Defaults to true.
/// </remarks>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public bool NoDelay { get; set; } = true;

/// <summary>
Expand All @@ -36,13 +36,13 @@ public class LibuvTransportOptions
/// <remarks>
/// Defaults to 128.
/// </remarks>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public int Backlog { get; set; } = 128;

[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public long? MaxReadBufferSize { get; set; } = 1024 * 1024;

[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public long? MaxWriteBufferSize { get; set; } = 64 * 1024;

internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = System.Buffers.SlabMemoryPoolFactory.Create;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Hosting
/// <summary>
/// Libuv <see cref="IWebHostBuilder"/> extensions.
/// </summary>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public static class WebHostBuilderLibuvExtensions
{
/// <summary>
Expand All @@ -24,7 +24,7 @@ public static class WebHostBuilderLibuvExtensions
/// <returns>
/// The Microsoft.AspNetCore.Hosting.IWebHostBuilder.
/// </returns>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public static IWebHostBuilder UseLibuv(this IWebHostBuilder hostBuilder)
{
return hostBuilder.ConfigureServices(services =>
Expand All @@ -45,7 +45,7 @@ public static IWebHostBuilder UseLibuv(this IWebHostBuilder hostBuilder)
/// <returns>
/// The Microsoft.AspNetCore.Hosting.IWebHostBuilder.
/// </returns>
[Obsolete("The libuv transport is obsolete and will be removed in a future release. See https://aka.ms/libuvtransport for details.", error: false)]
[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.
public static IWebHostBuilder UseLibuv(this IWebHostBuilder hostBuilder, Action<LibuvTransportOptions> configureOptions)
{
return hostBuilder.UseLibuv().ConfigureServices(services =>
Expand Down