diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs index 5e480488d671..c1bbe28155ae 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs @@ -144,7 +144,6 @@ public partial class ListenOptions : Microsoft.AspNetCore.Connections.IConnectio internal ListenOptions() { } public System.IServiceProvider ApplicationServices { get { throw null; } } public System.Collections.Generic.List ConnectionAdapters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.EndPoint EndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public ulong FileHandle { get { throw null; } } public System.Net.IPEndPoint IPEndPoint { get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } diff --git a/src/Servers/Kestrel/Core/src/ListenOptions.cs b/src/Servers/Kestrel/Core/src/ListenOptions.cs index 3a850c25f9f4..85651e1956ba 100644 --- a/src/Servers/Kestrel/Core/src/ListenOptions.cs +++ b/src/Servers/Kestrel/Core/src/ListenOptions.cs @@ -41,7 +41,7 @@ internal ListenOptions(ulong fileHandle, FileHandleType handleType) EndPoint = new FileHandleEndPoint(fileHandle, handleType); } - public EndPoint EndPoint { get; internal set; } + internal EndPoint EndPoint { get; set; } // IPEndPoint is mutable so port 0 can be updated to the bound port. /// diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs index 34c7f982bb60..c1e32cc39d9f 100644 --- a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs @@ -25,71 +25,3 @@ public SocketTransportOptions() { } public bool NoDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } } -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal -{ - public static partial class BufferExtensions - { - public static System.ArraySegment GetArray(this System.Memory memory) { throw null; } - public static System.ArraySegment GetArray(this System.ReadOnlyMemory memory) { throw null; } - } - public partial class IOQueue : System.IO.Pipelines.PipeScheduler, System.Threading.IThreadPoolWorkItem - { - public IOQueue() { } - public override void Schedule(System.Action action, object state) { } - void System.Threading.IThreadPoolWorkItem.Execute() { } - } - public partial interface ISocketsTrace : Microsoft.Extensions.Logging.ILogger - { - void ConnectionError(string connectionId, System.Exception ex); - void ConnectionPause(string connectionId); - void ConnectionReadFin(string connectionId); - void ConnectionReset(string connectionId); - void ConnectionResume(string connectionId); - void ConnectionWriteFin(string connectionId, string reason); - } - public partial class SocketAwaitableEventArgs : System.Net.Sockets.SocketAsyncEventArgs, System.Runtime.CompilerServices.ICriticalNotifyCompletion, System.Runtime.CompilerServices.INotifyCompletion - { - public SocketAwaitableEventArgs(System.IO.Pipelines.PipeScheduler ioScheduler) { } - public bool IsCompleted { get { throw null; } } - public void Complete() { } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketAwaitableEventArgs GetAwaiter() { throw null; } - public int GetResult() { throw null; } - public void OnCompleted(System.Action continuation) { } - protected override void OnCompleted(System.Net.Sockets.SocketAsyncEventArgs _) { } - public void UnsafeOnCompleted(System.Action continuation) { } - } - public sealed partial class SocketReceiver : Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketSenderReceiverBase - { - public SocketReceiver(System.Net.Sockets.Socket socket, System.IO.Pipelines.PipeScheduler scheduler) : base (default(System.Net.Sockets.Socket), default(System.IO.Pipelines.PipeScheduler)) { } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketAwaitableEventArgs ReceiveAsync(System.Memory buffer) { throw null; } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketAwaitableEventArgs WaitForDataAsync() { throw null; } - } - public sealed partial class SocketSender : Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketSenderReceiverBase - { - public SocketSender(System.Net.Sockets.Socket socket, System.IO.Pipelines.PipeScheduler scheduler) : base (default(System.Net.Sockets.Socket), default(System.IO.Pipelines.PipeScheduler)) { } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketAwaitableEventArgs SendAsync(System.Buffers.ReadOnlySequence buffers) { throw null; } - } - public abstract partial class SocketSenderReceiverBase : System.IDisposable - { - protected readonly Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.SocketAwaitableEventArgs _awaitableEventArgs; - protected readonly System.Net.Sockets.Socket _socket; - protected SocketSenderReceiverBase(System.Net.Sockets.Socket socket, System.IO.Pipelines.PipeScheduler scheduler) { } - public void Dispose() { } - } - public partial class SocketsTrace : Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal.ISocketsTrace, Microsoft.Extensions.Logging.ILogger - { - public SocketsTrace(Microsoft.Extensions.Logging.ILogger logger) { } - public System.IDisposable BeginScope(TState state) { throw null; } - public void ConnectionError(string connectionId, System.Exception ex) { } - public void ConnectionPause(string connectionId) { } - public void ConnectionRead(string connectionId, int count) { } - public void ConnectionReadFin(string connectionId) { } - public void ConnectionReset(string connectionId) { } - public void ConnectionResume(string connectionId) { } - public void ConnectionWrite(string connectionId, int count) { } - public void ConnectionWriteCallback(string connectionId, int status) { } - public void ConnectionWriteFin(string connectionId, string reason) { } - public bool IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) { throw null; } - public void Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception exception, System.Func formatter) { } - } -} diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/BufferExtensions.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/BufferExtensions.cs index 9985dfbc5bb0..807b18946c15 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/BufferExtensions.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/BufferExtensions.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public static class BufferExtensions + internal static class BufferExtensions { public static ArraySegment GetArray(this Memory memory) { diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs index 7a6da45db8c9..ad427857b2e1 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public class IOQueue : PipeScheduler, IThreadPoolWorkItem + internal class IOQueue : PipeScheduler, IThreadPoolWorkItem { private readonly ConcurrentQueue _workItems = new ConcurrentQueue(); private int _doingWork; diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/ISocketsTrace.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/ISocketsTrace.cs index afb719014296..38fa46104ac6 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/ISocketsTrace.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/ISocketsTrace.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public interface ISocketsTrace : ILogger + internal interface ISocketsTrace : ILogger { void ConnectionReadFin(string connectionId); diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketAwaitableEventArgs.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketAwaitableEventArgs.cs index d757316668e7..c9f4da86e8ef 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketAwaitableEventArgs.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketAwaitableEventArgs.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public class SocketAwaitableEventArgs : SocketAsyncEventArgs, ICriticalNotifyCompletion + internal class SocketAwaitableEventArgs : SocketAsyncEventArgs, ICriticalNotifyCompletion { private static readonly Action _callbackCompleted = () => { }; diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs index 1888ab87551c..c4b048fdf7af 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs @@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public sealed class SocketReceiver : SocketSenderReceiverBase + internal sealed class SocketReceiver : SocketSenderReceiverBase { public SocketReceiver(Socket socket, PipeScheduler scheduler) : base(socket, scheduler) { diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSender.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSender.cs index 62583df05d7e..235c2c3ec4e9 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSender.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSender.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public sealed class SocketSender : SocketSenderReceiverBase + internal sealed class SocketSender : SocketSenderReceiverBase { private List> _bufferList; diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSenderReceiverBase.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSenderReceiverBase.cs index 3258b31c584d..b28c7d798976 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSenderReceiverBase.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSenderReceiverBase.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public abstract class SocketSenderReceiverBase : IDisposable + internal abstract class SocketSenderReceiverBase : IDisposable { protected readonly Socket _socket; protected readonly SocketAwaitableEventArgs _awaitableEventArgs; diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketsTrace.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketsTrace.cs index 7d29e82666e5..33ffa5ff8a83 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketsTrace.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketsTrace.cs @@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public class SocketsTrace : ISocketsTrace + internal class SocketsTrace : ISocketsTrace { // ConnectionRead: Reserved: 3 diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj index ba3d364bf32f..4ed53085bc79 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj @@ -14,6 +14,7 @@ +