From 09f5be1434257948414ae993f52f975f99bf26cd Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Fri, 3 Jun 2016 11:32:55 -0700 Subject: [PATCH] fix #909 by moving most classes to Internal ns --- makefile.shade | 2 +- .../{Exceptions => }/BadHttpRequestException.cs | 2 +- .../Filter/{ => Internal}/FilteredStreamAdapter.cs | 8 ++++---- .../Filter/{ => Internal}/LibuvStream.cs | 6 +++--- .../Filter/{ => Internal}/LoggingStream.cs | 2 +- .../Filter/{ => Internal}/StreamSocketOutput.cs | 6 +++--- .../Filter/LoggingConnectionFilter.cs | 1 + .../Filter/NoOpConnectionFilter.cs | 3 +-- .../{ => Internal}/Http/ChunkWriter.cs | 4 ++-- .../{ => Internal}/Http/Connection.cs | 7 ++++--- .../{ => Internal}/Http/ConnectionContext.cs | 2 +- .../{ => Internal}/Http/ConnectionManager.cs | 4 ++-- .../{ => Internal}/Http/DateHeaderValueManager.cs | 4 ++-- .../{ => Internal}/Http/Frame.FeatureCollection.cs | 2 +- .../{ => Internal}/Http/Frame.Generated.cs | 2 +- .../{ => Internal}/Http/Frame.cs | 5 ++--- .../{ => Internal}/Http/FrameDuplexStream.cs | 2 +- .../{ => Internal}/Http/FrameHeaders.Generated.cs | 5 ++--- .../{ => Internal}/Http/FrameHeaders.cs | 2 +- .../{ => Internal}/Http/FrameOfT.cs | 3 +-- .../{ => Internal}/Http/FrameRequestHeaders.cs | 4 ++-- .../{ => Internal}/Http/FrameRequestStream.cs | 4 ++-- .../{ => Internal}/Http/FrameResponseHeaders.cs | 4 ++-- .../{ => Internal}/Http/FrameResponseStream.cs | 4 ++-- .../{ => Internal}/Http/FrameStreamState.cs | 2 +- .../{ => Internal}/Http/IAsyncDisposable.cs | 2 +- .../{ => Internal}/Http/IConnectionControl.cs | 2 +- .../{ => Internal}/Http/IFrameControl.cs | 2 +- .../{ => Internal}/Http/ISocketOutput.cs | 4 ++-- .../{ => Internal}/Http/Listener.cs | 4 ++-- .../{ => Internal}/Http/ListenerContext.cs | 6 +++--- .../{ => Internal}/Http/ListenerPrimary.cs | 6 +++--- .../{ => Internal}/Http/ListenerSecondary.cs | 6 +++--- .../{ => Internal}/Http/MessageBody.cs | 6 ++---- .../{ => Internal}/Http/PathNormalizer.cs | 4 +--- .../{ => Internal}/Http/PipeListener.cs | 7 +++---- .../{ => Internal}/Http/PipeListenerPrimary.cs | 7 +++---- .../{ => Internal}/Http/PipeListenerSecondary.cs | 4 ++-- .../{ => Internal}/Http/ProduceEndType.cs | 2 +- .../{ => Internal}/Http/ReasonPhrases.cs | 2 +- .../{ => Internal}/Http/SocketInput.cs | 4 ++-- .../{ => Internal}/Http/SocketInputExtensions.cs | 3 +-- .../{ => Internal}/Http/SocketOutput.cs | 6 +++--- .../{ => Internal}/Http/TcpListener.cs | 6 +++--- .../{ => Internal}/Http/TcpListenerPrimary.cs | 8 +++----- .../{ => Internal}/Http/TcpListenerSecondary.cs | 4 ++-- .../{ => Internal}/Http/UrlPathDecoder.cs | 4 ++-- .../{ => Internal}/Infrastructure/AsciiUtilities.cs | 2 +- .../{ => Internal}/Infrastructure/Constants.cs | 2 +- .../{ => Internal}/Infrastructure/Disposable.cs | 2 +- .../{ => Internal}/Infrastructure/IKestrelTrace.cs | 3 +-- .../{ => Internal}/Infrastructure/ISystemClock.cs | 2 +- .../{ => Internal}/Infrastructure/IThreadPool.cs | 2 +- .../{ => Internal}/Infrastructure/KestrelThread.cs | 6 +++--- .../{ => Internal}/Infrastructure/KestrelTrace.cs | 5 ++--- .../{ => Internal}/Infrastructure/LoggingThreadPool.cs | 2 +- .../{ => Internal}/Infrastructure/MemoryPool.cs | 2 +- .../{ => Internal}/Infrastructure/MemoryPoolBlock.cs | 3 +-- .../{ => Internal}/Infrastructure/MemoryPoolIterator.cs | 2 +- .../Infrastructure/MemoryPoolIteratorExtensions.cs | 3 +-- .../{ => Internal}/Infrastructure/MemoryPoolSlab.cs | 2 +- .../{ => Internal}/Infrastructure/Streams.cs | 4 ++-- .../{ => Internal}/Infrastructure/SystemClock.cs | 2 +- .../{ => Internal}/Infrastructure/TaskUtilities.cs | 2 +- .../{ => Internal}/KestrelEngine.cs | 6 +++--- .../{ => Internal}/Networking/Libuv.cs | 2 +- .../{ => Internal}/Networking/PlatformApis.cs | 3 +-- .../{ => Internal}/Networking/SockAddr.cs | 2 +- .../{ => Internal}/Networking/UvAsyncHandle.cs | 4 ++-- .../{ => Internal}/Networking/UvConnectRequest.cs | 4 ++-- .../{ => Internal}/Networking/UvException.cs | 2 +- .../{ => Internal}/Networking/UvHandle.cs | 4 ++-- .../{ => Internal}/Networking/UvLoopHandle.cs | 4 ++-- .../{ => Internal}/Networking/UvMemory.cs | 4 ++-- .../{ => Internal}/Networking/UvPipeHandle.cs | 5 ++--- .../{ => Internal}/Networking/UvRequest.cs | 4 ++-- .../{ => Internal}/Networking/UvShutdownReq.cs | 4 ++-- .../{ => Internal}/Networking/UvStreamHandle.cs | 6 +++--- .../{ => Internal}/Networking/UvTcpHandle.cs | 4 ++-- .../{ => Internal}/Networking/UvWriteReq.cs | 4 ++-- .../{ => Internal}/ServiceContext.cs | 6 +++--- src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs | 8 ++++---- src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs | 3 +-- .../AddressRegistrationTests.cs | 2 +- .../AsciiDecoding.cs | 5 ++--- .../BadHttpRequestTests.cs | 2 +- .../ChunkWriterTests.cs | 2 +- .../ConnectionTests.cs | 9 +++++---- .../CreateIPEndpointTests.cs | 2 +- .../DateHeaderValueManagerTests.cs | 4 ++-- .../DefaultHeaderTests.cs | 2 +- .../EngineTests.cs | 5 +++-- .../FrameRequestHeadersTests.cs | 4 ++-- .../FrameRequestStreamTests.cs | 2 +- .../FrameResponseHeadersTests.cs | 2 +- .../FrameResponseStreamTests.cs | 2 +- .../FrameTests.cs | 8 +++----- .../HttpsConnectionFilterTests.cs | 6 +++--- .../KestrelServerTests.cs | 2 +- .../LoggingThreadPoolTests.cs | 2 +- .../MemoryPoolBlockTests.cs | 2 +- .../MemoryPoolExtensions.cs | 2 +- .../MemoryPoolIteratorTests.cs | 2 +- .../MessageBodyTests.cs | 2 +- .../MultipleLoopTests.cs | 5 +++-- .../NetworkingTests.cs | 5 +++-- .../PathNormalizerTests.cs | 2 +- .../SocketInputTests.cs | 5 +++-- .../SocketOutputTests.cs | 7 ++++--- .../StreamSocketOutputTests.cs | 3 ++- .../TestConnection.cs | 2 +- .../TestHelpers/MockConnection.cs | 2 +- .../TestHelpers/MockFrameControl.cs | 4 ++-- .../TestHelpers/MockLibuv.cs | 2 +- .../TestHelpers/MockSocket.cs | 4 ++-- .../TestHelpers/MockSocketOuptut.cs | 4 ++-- .../TestHelpers/MockSystemClock.cs | 2 +- .../TestHelpers/PassThroughConnectionFilter.cs | 3 ++- .../TestHelpers/TestApplicationErrorLogger.cs | 1 + .../TestHelpers/TestKestrelTrace.cs | 3 +-- .../TestInput.cs | 5 +++-- .../TestServer.cs | 3 ++- .../TestServiceContext.cs | 5 +++-- .../UrlPathDecoder.cs | 4 ++-- .../FrameFeatureCollection.cs | 2 +- .../KnownHeaders.cs | 5 ++--- 126 files changed, 225 insertions(+), 236 deletions(-) rename src/Microsoft.AspNetCore.Server.Kestrel/{Exceptions => }/BadHttpRequestException.cs (86%) rename src/Microsoft.AspNetCore.Server.Kestrel/Filter/{ => Internal}/FilteredStreamAdapter.cs (94%) rename src/Microsoft.AspNetCore.Server.Kestrel/Filter/{ => Internal}/LibuvStream.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/Filter/{ => Internal}/LoggingStream.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/Filter/{ => Internal}/StreamSocketOutput.cs (96%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ChunkWriter.cs (94%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/Connection.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ConnectionContext.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ConnectionManager.cs (92%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/DateHeaderValueManager.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/Frame.FeatureCollection.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/Frame.Generated.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/Frame.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameDuplexStream.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameHeaders.Generated.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameHeaders.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameOfT.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameRequestHeaders.cs (96%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameRequestStream.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameResponseHeaders.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameResponseStream.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/FrameStreamState.cs (81%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/IAsyncDisposable.cs (82%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/IConnectionControl.cs (83%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/IFrameControl.cs (89%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ISocketOutput.cs (92%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/Listener.cs (96%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ListenerContext.cs (87%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ListenerPrimary.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ListenerSecondary.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/MessageBody.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/PathNormalizer.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/PipeListener.cs (90%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/PipeListenerPrimary.cs (90%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/PipeListenerSecondary.cs (87%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ProduceEndType.cs (82%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/ReasonPhrases.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/SocketInput.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/SocketInputExtensions.cs (94%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/SocketOutput.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/TcpListener.cs (91%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/TcpListenerPrimary.cs (91%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/TcpListenerSecondary.cs (87%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Http/UrlPathDecoder.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/AsciiUtilities.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/Constants.cs (96%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/Disposable.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/IKestrelTrace.cs (90%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/ISystemClock.cs (86%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/IThreadPool.cs (86%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/KestrelThread.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/KestrelTrace.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/LoggingThreadPool.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/MemoryPool.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/MemoryPoolBlock.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/MemoryPoolIterator.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/MemoryPoolIteratorExtensions.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/MemoryPoolSlab.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/Streams.cs (83%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/SystemClock.cs (89%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Infrastructure/TaskUtilities.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/KestrelEngine.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/Libuv.cs (99%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/PlatformApis.cs (88%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/SockAddr.cs (98%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvAsyncHandle.cs (94%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvConnectRequest.cs (93%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvException.cs (86%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvHandle.cs (93%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvLoopHandle.cs (89%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvMemory.cs (94%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvPipeHandle.cs (86%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvRequest.cs (81%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvShutdownReq.cs (91%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvStreamHandle.cs (96%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvTcpHandle.cs (95%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/Networking/UvWriteReq.cs (97%) rename src/Microsoft.AspNetCore.Server.Kestrel/{ => Internal}/ServiceContext.cs (85%) diff --git a/makefile.shade b/makefile.shade index c47d059fb9..a712540a3f 100644 --- a/makefile.shade +++ b/makefile.shade @@ -8,4 +8,4 @@ k-standard-goals custom-goals #initialize if='Directory.Exists("src")' - exec program='dotnet' commandline='run -p ../../tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode Http/FrameHeaders.Generated.cs Http/Frame.Generated.cs' workingdir='${kestrelSrcDir}' + exec program='dotnet' commandline='run -p ../../tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode Internal/Http/FrameHeaders.Generated.cs Internal/Http/Frame.Generated.cs' workingdir='${kestrelSrcDir}' diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Exceptions/BadHttpRequestException.cs b/src/Microsoft.AspNetCore.Server.Kestrel/BadHttpRequestException.cs similarity index 86% rename from src/Microsoft.AspNetCore.Server.Kestrel/Exceptions/BadHttpRequestException.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/BadHttpRequestException.cs index 19c004857e..f9ef840b12 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Exceptions/BadHttpRequestException.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/BadHttpRequestException.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.AspNetCore.Server.Kestrel.Exceptions +namespace Microsoft.AspNetCore.Server.Kestrel { public sealed class BadHttpRequestException : IOException { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/FilteredStreamAdapter.cs similarity index 94% rename from src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/FilteredStreamAdapter.cs index 8c721c5f91..bcd6b709e7 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/FilteredStreamAdapter.cs @@ -4,11 +4,11 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter.Internal { public class FilteredStreamAdapter : IDisposable { @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Filter { SocketInput.Dispose(); } - + private async Task FilterInputAsync(MemoryPoolBlock block) { int bytesRead; diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/LibuvStream.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/LibuvStream.cs index bf2c2c65e7..3ae1ddbd69 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/LibuvStream.cs @@ -5,10 +5,10 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter.Internal { public class LibuvStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/LoggingStream.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/LoggingStream.cs index a292850a82..e43d1c7f2d 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/LoggingStream.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter.Internal { internal class LoggingStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/StreamSocketOutput.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/StreamSocketOutput.cs index 0fce7a4760..bfd7d5201b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/Internal/StreamSocketOutput.cs @@ -6,10 +6,10 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter.Internal { public class StreamSocketOutput : ISocketOutput { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs index 81c900d8d3..fd77be1295 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.Kestrel.Filter.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Filter diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs index f41316e21f..6aa78fc5fc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs @@ -2,8 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.Kestrel.Filter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ChunkWriter.cs similarity index 94% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ChunkWriter.cs index 62dd3499ad..51f9d9f58e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ChunkWriter.cs @@ -3,9 +3,9 @@ using System; using System.Text; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public static class ChunkWriter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Connection.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Connection.cs index 1bfd927772..6472543165 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Connection.cs @@ -5,11 +5,12 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Filter; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Filter.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class Connection : ConnectionContext, IConnectionControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ConnectionContext.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ConnectionContext.cs index bea3e7c7a5..f66f95d5ab 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ConnectionContext.cs @@ -5,7 +5,7 @@ using System; using System.Net; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class ConnectionContext : ListenerContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionManager.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ConnectionManager.cs similarity index 92% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionManager.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ConnectionManager.cs index 640832a412..f546a6c87e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionManager.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ConnectionManager.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class ConnectionManager { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/DateHeaderValueManager.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/DateHeaderValueManager.cs index 57b0168364..b5fc6730e6 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/DateHeaderValueManager.cs @@ -4,9 +4,9 @@ using System; using System.Text; using System.Threading; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// Manages the generation of the date header value. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.FeatureCollection.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.FeatureCollection.cs index dc452096c3..75c1404ba5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.FeatureCollection.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public partial class Frame : IFeatureCollection, IHttpRequestFeature, diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.Generated.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.Generated.cs index 160304dcfc..adef63eee8 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.Generated.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public partial class Frame { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs index e4f0b419ec..9e45c3f695 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs @@ -11,14 +11,13 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; // ReSharper disable AccessToModifiedClosure -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public abstract partial class Frame : ConnectionContext, IFrameControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameDuplexStream.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameDuplexStream.cs index 7b904b15b3..7ec8b9a9bf 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameDuplexStream.cs @@ -8,7 +8,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { class FrameDuplexStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.Generated.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.Generated.cs index 804b9a9228..d72bc25e78 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.Generated.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public partial class FrameRequestHeaders diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.cs index ee7c1c562b..ba96ba8a47 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.cs @@ -8,7 +8,7 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public abstract class FrameHeaders : IHeaderDictionary { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameOfT.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameOfT.cs index c11150fadc..f19f287075 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameOfT.cs @@ -5,10 +5,9 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting.Server; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class Frame : Frame { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestHeaders.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestHeaders.cs index a90626f0ea..7d24bf3d8e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestHeaders.cs @@ -1,11 +1,11 @@ // 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 Microsoft.Extensions.Primitives; using System.Collections; using System.Collections.Generic; +using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public partial class FrameRequestHeaders : FrameHeaders { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestStream.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestStream.cs index c19a10a5dc..f2f7b379be 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestStream.cs @@ -5,9 +5,9 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { class FrameRequestStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseHeaders.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseHeaders.cs index 9697ad0e6d..9ea8056f27 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseHeaders.cs @@ -3,10 +3,10 @@ using System.Collections; using System.Collections.Generic; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public partial class FrameResponseHeaders : FrameHeaders { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseStream.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseStream.cs index 82edafb318..61013ac16c 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseStream.cs @@ -5,9 +5,9 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { class FrameResponseStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameStreamState.cs similarity index 81% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameStreamState.cs index 8f92bad5b9..8e1e26eaa5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameStreamState.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { enum FrameStreamState { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IAsyncDisposable.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IAsyncDisposable.cs similarity index 82% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/IAsyncDisposable.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IAsyncDisposable.cs index e2fb35aef6..0a6115a6dd 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IAsyncDisposable.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IAsyncDisposable.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { interface IAsyncDisposable { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IConnectionControl.cs similarity index 83% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IConnectionControl.cs index 6da7cac561..fbc181bce3 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IConnectionControl.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public interface IConnectionControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IFrameControl.cs similarity index 89% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IFrameControl.cs index f8ecbab894..0303188e3a 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/IFrameControl.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public interface IFrameControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ISocketOutput.cs similarity index 92% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ISocketOutput.cs index 51c95b13fe..29b57b8c90 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ISocketOutput.cs @@ -4,9 +4,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// Operations performed for buffered socket output diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Listener.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Listener.cs index 063d0a2f5f..a44c1b87bf 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Listener.cs @@ -3,10 +3,10 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// Base class for listeners in Kestrel. Listens for incoming connections diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerContext.cs similarity index 87% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerContext.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerContext.cs index 607c347981..83e9956e48 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerContext.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class ListenerContext : ServiceContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerPrimary.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerPrimary.cs index 4f5bb907fb..a9b938d158 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerPrimary.cs @@ -5,11 +5,11 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// A primary listener waits for incoming connections on a specified socket. Incoming diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerSecondary.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerSecondary.cs index 2e8e89911b..1a6ea958b4 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ListenerSecondary.cs @@ -5,11 +5,11 @@ using System; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// A secondary listener is delegated requests from a primary listener via a named pipe or diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/MessageBody.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/MessageBody.cs index bd2a9ba2e5..5d0e37c29e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/MessageBody.cs @@ -2,14 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; using System.Numerics; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public abstract class MessageBody { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PathNormalizer.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PathNormalizer.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/PathNormalizer.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PathNormalizer.cs index 65b59e4a0e..191eeb885e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PathNormalizer.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PathNormalizer.cs @@ -1,11 +1,9 @@ // 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; using System.Buffers; -using System.Text; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public static class PathNormalizer { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListener.cs similarity index 90% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListener.cs index 3ee24032d6..cb79dadd07 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListener.cs @@ -1,12 +1,11 @@ // 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; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// Implementation of that uses UNIX domain sockets as its transport. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListenerPrimary.cs similarity index 90% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListenerPrimary.cs index 07d353119f..65b9521f1f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListenerPrimary.cs @@ -1,12 +1,11 @@ // 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; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// An implementation of using UNIX sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListenerSecondary.cs similarity index 87% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListenerSecondary.cs index 1ec2373b4c..be9879f13b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/PipeListenerSecondary.cs @@ -1,9 +1,9 @@ // 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 Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// An implementation of using UNIX sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ProduceEndType.cs similarity index 82% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ProduceEndType.cs index 4099e1c864..06da2e11e6 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ProduceEndType.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public enum ProduceEndType { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ReasonPhrases.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ReasonPhrases.cs index df007f573e..e78847e300 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/ReasonPhrases.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.Text; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public static class ReasonPhrases { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketInput.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketInput.cs index 87f82474c8..3082edf708 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketInput.cs @@ -7,9 +7,9 @@ using System.IO; using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class SocketInput : ICriticalNotifyCompletion, IDisposable { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketInputExtensions.cs similarity index 94% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketInputExtensions.cs index 7a74140435..af16744bf5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketInputExtensions.cs @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public static class SocketInputExtensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketOutput.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketOutput.cs index 8b3ec4f042..fc43cd67fa 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/SocketOutput.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class SocketOutput : ISocketOutput { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListener.cs similarity index 91% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListener.cs index cc7e3f9aff..353afad609 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListener.cs @@ -1,11 +1,11 @@ // 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 Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// Implementation of that uses TCP sockets as its transport. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListenerPrimary.cs similarity index 91% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListenerPrimary.cs index 926cd014b2..dc47a375c5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListenerPrimary.cs @@ -1,13 +1,11 @@ // 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; -using System.Net; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// An implementation of using TCP sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListenerSecondary.cs similarity index 87% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListenerSecondary.cs index 1a19445d50..0a34eb7202 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/TcpListenerSecondary.cs @@ -1,9 +1,9 @@ // 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 Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { /// /// An implementation of using TCP sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/UrlPathDecoder.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/UrlPathDecoder.cs index 90895fe691..7ce0ce8990 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/UrlPathDecoder.cs @@ -1,9 +1,9 @@ // 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 Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http { public class UrlPathDecoder { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/AsciiUtilities.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/AsciiUtilities.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/AsciiUtilities.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/AsciiUtilities.cs index 2d9a04ee5b..1959ca23d9 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/AsciiUtilities.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/AsciiUtilities.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { internal class AsciiUtilities { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Constants.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Constants.cs index bbe6442f87..2d270d9955 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Constants.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { internal class Constants { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Disposable.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Disposable.cs index 5d3b53c9df..fb0e68855f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Disposable.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel.Internal { /// /// Summary description for Disposable diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/IKestrelTrace.cs similarity index 90% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/IKestrelTrace.cs index 4dd0beb17d..e18a99ce21 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/IKestrelTrace.cs @@ -1,8 +1,7 @@ using System; using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { public interface IKestrelTrace : ILogger { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/ISystemClock.cs similarity index 86% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/ISystemClock.cs index 1818f68fd2..0cf54d7e64 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/ISystemClock.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { /// /// Abstracts the system clock to facilitate testing. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/IThreadPool.cs similarity index 86% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/IThreadPool.cs index f9217bd992..e4fe4eb40a 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/IThreadPool.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { public interface IThreadPool { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/KestrelThread.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/KestrelThread.cs index b176cfa697..3813d75980 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/KestrelThread.cs @@ -7,11 +7,11 @@ using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel.Internal { /// /// Summary description for KestrelThread diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/KestrelTrace.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/KestrelTrace.cs index 1869e3446e..0215b45374 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/KestrelTrace.cs @@ -2,11 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel.Internal { /// /// Summary description for KestrelTrace diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/LoggingThreadPool.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/LoggingThreadPool.cs index e9625cffec..6cdf0014c2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/LoggingThreadPool.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { public class LoggingThreadPool : IThreadPool { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPool.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPool.cs index 6fd37f8a9c..4641206872 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPool.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Concurrent; using System.Diagnostics; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { /// /// Used to allocate and distribute re-usable blocks of memory. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolBlock.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolBlock.cs index a57332a839..52f6825a77 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolBlock.cs @@ -1,9 +1,8 @@ using System; using System.Diagnostics; -using System.Runtime.InteropServices; using System.Text; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { /// /// Block tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIterator.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIterator.cs index 3e17b6c4b8..68397406bb 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIterator.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Numerics; using System.Threading; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { public struct MemoryPoolIterator { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIteratorExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIteratorExtensions.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIteratorExtensions.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIteratorExtensions.cs index 5d1953166e..5845c4fa1e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIteratorExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolIteratorExtensions.cs @@ -4,9 +4,8 @@ using System; using System.Diagnostics; using System.Text; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { public static class MemoryPoolIteratorExtensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolSlab.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolSlab.cs index d0acab4d6c..e61b12c6ca 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/MemoryPoolSlab.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { /// /// Slab tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Streams.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Streams.cs similarity index 83% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Streams.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Streams.cs index af0a3384c2..18712eed2f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Streams.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/Streams.cs @@ -1,9 +1,9 @@ // 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 Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { class Streams { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/SystemClock.cs similarity index 89% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/SystemClock.cs index 1718890eea..eb4e7e099e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/SystemClock.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { /// /// Provides access to the normal system clock. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs index 328c8ecb05..139411bca0 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure { public static class TaskUtilities { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/KestrelEngine.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/KestrelEngine.cs index db0e28956d..a3faaad6a4 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/KestrelEngine.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; -namespace Microsoft.AspNetCore.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel.Internal { public class KestrelEngine : ServiceContext, IDisposable { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/Libuv.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/Libuv.cs index a5028b136c..ee2a25855e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/Libuv.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class Libuv { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/PlatformApis.cs similarity index 88% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/PlatformApis.cs index 17985da608..e81974adb2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/PlatformApis.cs @@ -1,10 +1,9 @@ // 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; using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public static class PlatformApis { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/SockAddr.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/SockAddr.cs index 29c850df84..d2d14774ef 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/SockAddr.cs @@ -4,7 +4,7 @@ using System; using System.Net; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public struct SockAddr { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvAsyncHandle.cs similarity index 94% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvAsyncHandle.cs index 3215a8730c..93c1efcc64 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvAsyncHandle.cs @@ -4,9 +4,9 @@ using System; using System.Diagnostics; using System.Threading; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class UvAsyncHandle : UvHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvConnectRequest.cs similarity index 93% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvConnectRequest.cs index bccd31a57b..85df07621d 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvConnectRequest.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { /// /// Summary description for UvWriteRequest diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvException.cs similarity index 86% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvException.cs index 791c1f95ac..5e7b26e998 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvException.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class UvException : Exception { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvHandle.cs similarity index 93% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvHandle.cs index d672189698..3db7dc21a3 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvHandle.cs @@ -4,9 +4,9 @@ using System; using System.Diagnostics; using System.Threading; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public abstract class UvHandle : UvMemory { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvLoopHandle.cs similarity index 89% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvLoopHandle.cs index e368c6ea34..0d92f89770 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvLoopHandle.cs @@ -3,9 +3,9 @@ using System; using System.Threading; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class UvLoopHandle : UvMemory { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvMemory.cs similarity index 94% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvMemory.cs index 162fed17e8..ecd15751e5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvMemory.cs @@ -5,9 +5,9 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; using System.Threading; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { /// /// Summary description for UvMemory diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvPipeHandle.cs similarity index 86% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvPipeHandle.cs index 6604dfbb28..ef2d2d9bea 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvPipeHandle.cs @@ -2,10 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Net; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class UvPipeHandle : UvStreamHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvRequest.cs similarity index 81% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvRequest.cs index 87fe48c726..bffeb5d5e2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvRequest.cs @@ -1,8 +1,8 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class UvRequest : UvMemory { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvShutdownReq.cs similarity index 91% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvShutdownReq.cs index 0342b3d25f..f69937e5b8 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvShutdownReq.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { /// /// Summary description for UvShutdownRequest diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvStreamHandle.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvStreamHandle.cs index eb94d78ef0..bc0bbc64a9 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvStreamHandle.cs @@ -3,11 +3,11 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public abstract class UvStreamHandle : UvHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvTcpHandle.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvTcpHandle.cs index 6e7e9b2549..3684f4f412 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvTcpHandle.cs @@ -4,9 +4,9 @@ using System; using System.Net; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { public class UvTcpHandle : UvStreamHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvWriteReq.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvWriteReq.cs index bc776767a6..4a0aec28bc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Networking/UvWriteReq.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Networking { /// /// Summary description for UvWriteRequest diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/ServiceContext.cs similarity index 85% rename from src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs rename to src/Microsoft.AspNetCore.Server.Kestrel/Internal/ServiceContext.cs index a2e1aa4f53..77932ecf15 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/ServiceContext.cs @@ -3,10 +3,10 @@ using System; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel.Internal { public class ServiceContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs index 1770678b29..3a38ce6df6 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs @@ -4,15 +4,15 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Reflection; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs index 17258184dd..67d00e1700 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs @@ -4,8 +4,7 @@ using System; using System.Diagnostics; using System.Globalization; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.Kestrel { diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs index c5f90cf61b..ee0651920c 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.AspNetCore.Testing.xunit; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoding.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoding.cs index 8d62e034c5..91d368a90b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoding.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoding.cs @@ -1,10 +1,9 @@ // 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; using System.Linq; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs index e4b9686157..77a6db674f 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/BadHttpRequestTests.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs index af70086103..d66ac3f60b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionTests.cs index f5313a6f10..f6b43c2d13 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionTests.cs @@ -1,9 +1,10 @@ using System.Threading; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Xunit; @@ -15,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests public void DoesNotEndConnectionOnZeroRead() { var mockLibuv = new MockLibuv(); - + using (var memory = new MemoryPool()) using (var engine = new KestrelEngine(mockLibuv, new TestServiceContext())) { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs index 7c097f66e8..7a8742e864 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs @@ -3,7 +3,7 @@ using System.Net; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs index 0c221cba52..0d3e4dc133 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs @@ -3,8 +3,8 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs index b682dd35de..890f663d12 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/DefaultHeaderTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs index d90c38ad6c..c2b1a7aa37 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs @@ -11,8 +11,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs index 14ef396c1e..6f07dd90ac 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Text; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Microsoft.Extensions.Primitives; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs index b201db9b99..80368ee5d2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs index 3118a008f1..bfca1e9158 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Microsoft.Extensions.Primitives; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs index 556fc6701f..64590151bc 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs index 62ac9c5164..52c44bb2b4 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs @@ -2,14 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; using System.Text; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs index 0d5113ab5b..7946845290 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Filter; using Microsoft.AspNetCore.Server.Kestrel.Https; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -32,10 +32,10 @@ namespace Microsoft.AspNetCore.Server.KestrelTests #if NET451 static HttpsConnectionFilterTests() { - // SecurityProtocolType values below not available in Mono < 4.3 + // SecurityProtocolType values below not available in Mono < 4.3 const int SecurityProtocolTypeTls11 = 768; const int SecurityProtocolTypeTls12 = 3072; - ServicePointManager.SecurityProtocol |= (SecurityProtocolType)(SecurityProtocolTypeTls12 | SecurityProtocolTypeTls11); + ServicePointManager.SecurityProtocol |= (SecurityProtocolType)(SecurityProtocolTypeTls12 | SecurityProtocolTypeTls11); } #endif diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs index f83e6bcc0a..556d6f848e 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/LoggingThreadPoolTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/LoggingThreadPoolTests.cs index 92b8c2c94f..431e79b119 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/LoggingThreadPoolTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/LoggingThreadPoolTests.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlockTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlockTests.cs index 0e86d2d7d6..a9c5652e4e 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlockTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlockTests.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using System.Numerics; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs index e2cd3bdfa8..6348258ce9 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIteratorTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIteratorTests.cs index 4e8a02c365..803cf52d61 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIteratorTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIteratorTests.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using System.Numerics; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs index fafeaca0ed..f8dba124ef 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs @@ -4,7 +4,7 @@ using System; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs index c5a6f0ee10..a57eb55f6b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs @@ -6,8 +6,9 @@ using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs index e8d3f66fcd..aff4f2e212 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs @@ -7,8 +7,9 @@ using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/PathNormalizerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/PathNormalizerTests.cs index d19eb63705..92c0b3f688 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/PathNormalizerTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/PathNormalizerTests.cs @@ -3,7 +3,7 @@ using System; using System.Text; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs index 2a0d792051..15c7bc0c24 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs @@ -4,8 +4,9 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs index a398c5cb66..639d52741f 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs @@ -6,9 +6,10 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Xunit; diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs index 46c0384f30..f01397fc0f 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs @@ -4,7 +4,8 @@ using System; using System.IO; using Microsoft.AspNetCore.Server.Kestrel.Filter; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Filter.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs index 30ec6f4879..7bae6b888b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs @@ -8,7 +8,7 @@ using System.Net; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs index 7181507494..efe612c47e 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs @@ -4,7 +4,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs index 0f5faf7148..1ec4ec728b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockFrameControl.cs @@ -4,8 +4,8 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs index aa9c35523c..254ce726b2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs @@ -1,6 +1,6 @@ using System; using System.Threading; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocket.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocket.cs index 4e41590dd9..7b398464d1 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocket.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocket.cs @@ -1,6 +1,6 @@ using System; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs index 8a516c4174..07af801aa7 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSocketOuptut.cs @@ -4,8 +4,8 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs index 75c8951e60..d18e114f5c 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/PassThroughConnectionFilter.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/PassThroughConnectionFilter.cs index 2342536d3c..561609899a 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/PassThroughConnectionFilter.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/PassThroughConnectionFilter.cs @@ -3,7 +3,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Filter; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Filter.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestApplicationErrorLogger.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestApplicationErrorLogger.cs index ea02bb3c64..2534de82da 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestApplicationErrorLogger.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestApplicationErrorLogger.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestKestrelTrace.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestKestrelTrace.cs index 5d811063b1..741ec54a0b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestKestrelTrace.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestKestrelTrace.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs index 4c73c043b0..a868068b5c 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs @@ -5,8 +5,9 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.KestrelTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs index 2a3deab41f..f4a840d967 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs @@ -4,7 +4,8 @@ using System; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel; -using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; namespace Microsoft.AspNetCore.Server.KestrelTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs index 3c3cf36c77..10049f461c 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs @@ -5,8 +5,9 @@ using System; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel; using Microsoft.AspNetCore.Server.Kestrel.Filter; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs index 31e1ccdbc9..c33c8e5168 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs @@ -3,8 +3,8 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Server.Kestrel.Http; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Server.KestrelTests diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs index 2eb781cde6..950f06b730 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http {{ public partial class Frame {{{Each(allFeatures, feature => $@" diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs index ca9073e9da..53dff0dd53 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs @@ -199,11 +199,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode return $@" using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Server.Kestrel.Exceptions; -using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http {{ {Each(loops, loop => $@" public partial class {loop.ClassName}