From b062f851dcb1fc9013952fe72e9a087ae36323fe Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 22 Jan 2016 12:23:51 -0800 Subject: [PATCH] Rename AspNet 5 file contents. See https://github.com/aspnet/Announcements/issues/144 for more information. --- KestrelHttpServer.sln | 14 +- NuGetPackageVerifier.json | 2 +- samples/LargeResponseApp/Startup.cs | 6 +- samples/LargeResponseApp/hosting.json | 4 +- samples/LargeResponseApp/project.json | 4 +- samples/SampleApp/Startup.cs | 12 +- samples/SampleApp/hosting.json | 4 +- samples/SampleApp/project.json | 4 +- .../ClientCertificateMode.cs | 4 +- .../HttpsApplicationBuilderExtensions.cs | 10 +- .../HttpsConnectionFilter.cs | 10 +- .../HttpsConnectionFilterOptions.cs | 4 +- ...soft.AspNetCore.Server.Kestrel.Https.xproj | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../project.json | 2 +- .../Filter/ConnectionFilterContext.cs | 6 +- .../Filter/FilteredStreamAdapter.cs | 8 +- .../Filter/IConnectionFilter.cs | 4 +- .../Filter/LibuvStream.cs | 6 +- .../Filter/LoggingConnectionFilter.cs | 4 +- ...ggingFilterApplicationBuilderExtensions.cs | 8 +- .../Filter/LoggingStream.cs | 4 +- .../Filter/NoOpConnectionFilter.cs | 8 +- .../Filter/SocketInputStream.cs | 8 +- .../Filter/StreamExtensions.cs | 6 +- .../Filter/StreamSocketOutput.cs | 8 +- .../Http/ChunkWriter.cs | 6 +- .../Http/Connection.cs | 8 +- .../Http/ConnectionContext.cs | 2 +- .../Http/DateHeaderValueManager.cs | 6 +- .../Http/Frame.FeatureCollection.cs | 8 +- .../Http/Frame.Generated.cs | 130 +++++++++--------- .../Http/Frame.cs | 8 +- .../Http/FrameContext.cs | 2 +- .../Http/FrameDuplexStream.cs | 2 +- .../Http/FrameHeaders.Generated.cs | 4 +- .../Http/FrameHeaders.cs | 4 +- .../Http/FrameOfT.cs | 8 +- .../Http/FrameRequestHeaders.cs | 2 +- .../Http/FrameRequestStream.cs | 2 +- .../Http/FrameResponseHeaders.cs | 4 +- .../Http/FrameResponseStream.cs | 2 +- .../Http/FrameStreamState.cs | 4 +- .../Http/IConnectionControl.cs | 2 +- .../Http/IFrameControl.cs | 2 +- .../Http/ISocketOutput.cs | 4 +- .../Http/Listener.cs | 4 +- .../Http/ListenerContext.cs | 6 +- .../Http/ListenerPrimary.cs | 6 +- .../Http/ListenerSecondary.cs | 8 +- .../Http/MessageBody.cs | 2 +- .../Http/PipeListener.cs | 6 +- .../Http/PipeListenerPrimary.cs | 6 +- .../Http/PipeListenerSecondary.cs | 6 +- .../Http/ProduceEndType.cs | 2 +- .../Http/ReasonPhrases.cs | 2 +- .../Http/SocketInput.cs | 4 +- .../Http/SocketInputExtensions.cs | 6 +- .../Http/SocketOutput.cs | 6 +- .../Http/TcpListener.cs | 6 +- .../Http/TcpListenerPrimary.cs | 6 +- .../Http/TcpListenerSecondary.cs | 6 +- .../Http/UrlPathDecoder.cs | 6 +- .../IKestrelServerInformation.cs | 4 +- .../Infrastructure/Constants.cs | 4 +- .../Infrastructure/Disposable.cs | 2 +- .../Infrastructure/IKestrelTrace.cs | 2 +- .../Infrastructure/ISystemClock.cs | 4 +- .../Infrastructure/IThreadPool.cs | 4 +- .../Infrastructure/KestrelThread.cs | 10 +- .../Infrastructure/KestrelTrace.cs | 4 +- .../Infrastructure/LoggingThreadPool.cs | 2 +- .../Infrastructure/MemoryPool2.cs | 4 +- .../Infrastructure/MemoryPoolBlock2.cs | 4 +- .../Infrastructure/MemoryPoolIterator2.cs | 4 +- .../MemoryPoolIterator2Extensions.cs | 4 +- .../Infrastructure/MemoryPoolSlab2.cs | 4 +- .../Infrastructure/SystemClock.cs | 4 +- .../Infrastructure/TaskUtilities.cs | 2 +- .../KestrelEngine.cs | 8 +- .../KestrelServer.cs | 14 +- .../KestrelServerInformation.cs | 6 +- .../Networking/Libuv.cs | 2 +- .../Networking/PlatformApis.cs | 2 +- .../Networking/SockAddr.cs | 4 +- .../Networking/UvAsyncHandle.cs | 4 +- .../Networking/UvConnectRequest.cs | 4 +- .../Networking/UvException.cs | 4 +- .../Networking/UvHandle.cs | 4 +- .../Networking/UvLoopHandle.cs | 4 +- .../Networking/UvMemory.cs | 4 +- .../Networking/UvPipeHandle.cs | 4 +- .../Networking/UvRequest.cs | 6 +- .../Networking/UvShutdownReq.cs | 4 +- .../Networking/UvStreamHandle.cs | 4 +- .../Networking/UvTcpHandle.cs | 4 +- .../Networking/UvWriteReq.cs | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../ServerAddress.cs | 6 +- .../ServerFactory.cs | 12 +- .../ServiceContext.cs | 14 +- .../project.json | 14 +- .../AddressRegistrationTests.cs | 16 +-- .../IPv6SupportedConditionAttribute.cs | 4 +- ...tCore.Server.Kestrel.FunctionalTests.xproj | 4 +- .../PathBaseTests.cs | 14 +- .../RequestTests.cs | 18 +-- .../ResponseTests.cs | 18 +-- .../ThreadCountTests.cs | 12 +- .../project.json | 6 +- .../AsciiDecoder.cs | 6 +- .../ChunkWriterTests.cs | 6 +- .../ChunkedResponseTests.cs | 6 +- .../ConnectionFilterTests.cs | 12 +- .../CreateIPEndpointTests.cs | 8 +- .../DateHeaderValueManagerTests.cs | 10 +- .../DummyApplication.cs | 12 +- .../EngineTests.cs | 16 +-- .../FrameFacts.cs | 10 +- .../FrameRequestHeadersTests.cs | 4 +- .../FrameResponseHeadersTests.cs | 6 +- .../FrameTests.cs | 8 +- .../HttpsConnectionFilterTests.cs | 14 +- .../KestrelServerInformationTests.cs | 6 +- .../KestrelServerTests.cs | 12 +- .../LifetimeNotImplemented.cs | 6 +- .../MemoryPoolBlock2Tests.cs | 6 +- .../MemoryPoolExtensions.cs | 4 +- .../MemoryPoolIterator2Tests.cs | 6 +- .../MessageBodyTests.cs | 4 +- .../MultipleLoopTests.cs | 10 +- .../NetworkingTests.cs | 8 +- .../Program.cs | 4 +- .../ServerAddressFacts.cs | 4 +- .../SocketInputTests.cs | 10 +- .../SocketOutputTests.cs | 14 +- .../StreamSocketOutputTests.cs | 8 +- .../TestConnection.cs | 4 +- .../TestDateHeaderValueManager.cs | 6 +- .../TestHelpers/MockLibuv.cs | 4 +- .../TestHelpers/MockSystemClock.cs | 6 +- .../TestInput.cs | 10 +- .../TestLogger.cs | 4 +- .../TestServer.cs | 10 +- .../TestServiceContext.cs | 12 +- .../UrlPathDecoder.cs | 8 +- .../project.json | 8 +- .../FrameFeatureCollection.cs | 14 +- .../KnownHeaders.cs | 6 +- ...NetCore.Server.Kestrel.GeneratedCode.xproj | 4 +- .../Program.cs | 4 +- .../project.json | 6 +- ...spNetCore.Server.Kestrel.LibuvCopier.xproj | 4 +- .../Program.cs | 6 +- .../project.json | 4 +- 155 files changed, 541 insertions(+), 541 deletions(-) diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index a0670dfc2a..f54a7e5fa5 100644 --- a/KestrelHttpServer.sln +++ b/KestrelHttpServer.sln @@ -1,11 +1,11 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel", "src\Microsoft.AspNet.Server.Kestrel\Microsoft.AspNet.Server.Kestrel.xproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Kestrel", "src\Microsoft.AspNetCore.Server.Kestrel\Microsoft.AspNetCore.Server.Kestrel.xproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.KestrelTests", "test\Microsoft.AspNet.Server.KestrelTests\Microsoft.AspNet.Server.KestrelTests.xproj", "{37F3BFB2-6454-49E5-9D7F-581BF755CCFE}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.KestrelTests", "test\Microsoft.AspNetCore.Server.KestrelTests\Microsoft.AspNetCore.Server.KestrelTests.xproj", "{37F3BFB2-6454-49E5-9D7F-581BF755CCFE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7972A5D6-3385-4127-9277-428506DD44FF}" ProjectSection(SolutionItems) = preProject @@ -25,17 +25,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8A3D EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LargeResponseApp", "samples\LargeResponseApp\LargeResponseApp.xproj", "{B35D4D31-E74C-4646-8A11-7A7A40F0021E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel.GeneratedCode", "tools\Microsoft.AspNet.Server.Kestrel.GeneratedCode\Microsoft.AspNet.Server.Kestrel.GeneratedCode.xproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Kestrel.GeneratedCode", "tools\Microsoft.AspNetCore.Server.Kestrel.GeneratedCode\Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{327F7880-D9AF-46BD-B45C-3B7E34A01DFD}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.StandardsPolice", "tools\Microsoft.StandardsPolice\Microsoft.StandardsPolice.xproj", "{82295647-7C1C-4671-BAB6-0FEF58F949EC}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel.LibuvCopier", "tools\Microsoft.AspNet.Server.Kestrel.LibuvCopier\Microsoft.AspNet.Server.Kestrel.LibuvCopier.xproj", "{8CBA6FE3-3CC9-4420-8AA3-123E983734C2}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Kestrel.LibuvCopier", "tools\Microsoft.AspNetCore.Server.Kestrel.LibuvCopier\Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj", "{8CBA6FE3-3CC9-4420-8AA3-123E983734C2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel.Https", "src\Microsoft.AspNet.Server.Kestrel.Https\Microsoft.AspNet.Server.Kestrel.Https.xproj", "{5F64B3C3-0C2E-431A-B820-A81BBFC863DA}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "src\Microsoft.AspNetCore.Server.Kestrel.Https\Microsoft.AspNetCore.Server.Kestrel.Https.xproj", "{5F64B3C3-0C2E-431A-B820-A81BBFC863DA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel.FunctionalTests", "test\Microsoft.AspNet.Server.Kestrel.FunctionalTests\Microsoft.AspNet.Server.Kestrel.FunctionalTests.xproj", "{9559A5F1-080C-4909-B6CF-7E4B3DC55748}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Kestrel.FunctionalTests", "test\Microsoft.AspNetCore.Server.Kestrel.FunctionalTests\Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj", "{9559A5F1-080C-4909-B6CF-7E4B3DC55748}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 1ae60f54db..a79bd3779c 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,7 +9,7 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Server.Kestrel": { } + "Microsoft.AspNetCore.Server.Kestrel": { } } }, "Default": { // Rules to run for packages not listed in any other set. diff --git a/samples/LargeResponseApp/Startup.cs b/samples/LargeResponseApp/Startup.cs index 241d754a38..a6cba98657 100644 --- a/samples/LargeResponseApp/Startup.cs +++ b/samples/LargeResponseApp/Startup.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; namespace LargeResponseApp { diff --git a/samples/LargeResponseApp/hosting.json b/samples/LargeResponseApp/hosting.json index 7e1c57a3f0..72788f30a9 100644 --- a/samples/LargeResponseApp/hosting.json +++ b/samples/LargeResponseApp/hosting.json @@ -1,4 +1,4 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel", +{ + "server": "Microsoft.AspNetCore.Server.Kestrel", "server.urls": "http://localhost:5001/" } \ No newline at end of file diff --git a/samples/LargeResponseApp/project.json b/samples/LargeResponseApp/project.json index 2fb9fdb1a0..0b96a43065 100644 --- a/samples/LargeResponseApp/project.json +++ b/samples/LargeResponseApp/project.json @@ -1,7 +1,7 @@ -{ +{ "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/SampleApp/Startup.cs b/samples/SampleApp/Startup.cs index 830e6283a6..c593da33a6 100644 --- a/samples/SampleApp/Startup.cs +++ b/samples/SampleApp/Startup.cs @@ -4,11 +4,11 @@ using System; using System.IO; using System.Security.Cryptography.X509Certificates; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Filter; using Microsoft.Extensions.Logging; using Microsoft.Extensions.PlatformAbstractions; @@ -26,7 +26,7 @@ namespace SampleApp var testCertPath = Path.Combine( env.ApplicationBasePath, - @"../../test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx"); + @"../../test/Microsoft.AspNetCore.Server.KestrelTests/TestResources/testCert.pfx"); if (File.Exists(testCertPath)) { diff --git a/samples/SampleApp/hosting.json b/samples/SampleApp/hosting.json index 66f354cbc2..5d7efdc792 100644 --- a/samples/SampleApp/hosting.json +++ b/samples/SampleApp/hosting.json @@ -1,4 +1,4 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel", +{ + "server": "Microsoft.AspNetCore.Server.Kestrel", "server.urls": "http://localhost:5000;https://localhost:5001" } diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json index 42f19ecb21..d96001e9bd 100644 --- a/samples/SampleApp/project.json +++ b/samples/SampleApp/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel.Https": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "compilationOptions": { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs index 34e8b839eb..9697cb6476 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Server.Kestrel.Https +namespace Microsoft.AspNetCore.Server.Kestrel.Https { public enum ClientCertificateMode { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs index e31f0f6482..eb8a95862b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsApplicationBuilderExtensions.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Security.Cryptography.X509Certificates; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Https; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Https; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public static class HttpsApplicationBuilderExtensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs index 615a846c1a..55f1fc1ab7 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,11 +6,11 @@ using System.Net.Security; using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Features.Internal; -using Microsoft.AspNet.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Features.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Filter; -namespace Microsoft.AspNet.Server.Kestrel.Https +namespace Microsoft.AspNetCore.Server.Kestrel.Https { public class HttpsConnectionFilter : IConnectionFilter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs index e066c17f3c..a33e3b090d 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilterOptions.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,7 +6,7 @@ using System.Net.Security; using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; -namespace Microsoft.AspNet.Server.Kestrel.Https +namespace Microsoft.AspNetCore.Server.Kestrel.Https { public class HttpsConnectionFilterOptions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.xproj b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.xproj index 4ae185e402..31375db430 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.xproj +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ 5f64b3c3-0c2e-431a-b820-a81bbfc863da - Microsoft.AspNet.Server.Kestrel.Https + Microsoft.AspNetCore.Server.Kestrel.Https ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs index a8f71a20f0..24e236d5f2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs @@ -5,6 +5,6 @@ using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNet.Server.KestrelTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.KestrelTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-us")] diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json b/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json index 9598ce03d5..d2cb35dcdb 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json @@ -9,7 +9,7 @@ "url": "git://github.com/aspnet/kestrelhttpserver" }, "dependencies": { - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "frameworks": { "net451": { }, diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/ConnectionFilterContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/ConnectionFilterContext.cs index fc4f0384c6..386753342f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/ConnectionFilterContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/ConnectionFilterContext.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.IO; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public class ConnectionFilterContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs index 2697d45b71..de144a0cc0 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public class FilteredStreamAdapter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/IConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/IConnectionFilter.cs index 437e4e3ed9..0447f8b07a 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/IConnectionFilter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/IConnectionFilter.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public interface IConnectionFilter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs index 1e019c8381..081861a9ca 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LibuvStream.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Http; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public class LibuvStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs index e34e4fcb50..81c900d8d3 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingConnectionFilter.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public class LoggingConnectionFilter : IConnectionFilter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs index de0ffab1ac..8d373f5897 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingFilterApplicationBuilderExtensions.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public static class LoggingFilterApplicationBuilderExtensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs index efec582245..a292850a82 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/LoggingStream.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { internal class LoggingStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs index 663aea65d3..f41316e21f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/NoOpConnectionFilter.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public class NoOpConnectionFilter : IConnectionFilter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/SocketInputStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/SocketInputStream.cs index d6cc5748f8..b10b1f9c69 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/SocketInputStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/SocketInputStream.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { /// /// This is a write-only stream that copies what is written into a diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamExtensions.cs index af3e77d15f..72c3fb9fd9 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamExtensions.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public static class StreamExtensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs index 6ee20338f4..ccc752ae9b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Filter/StreamSocketOutput.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,10 +6,10 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Filter +namespace Microsoft.AspNetCore.Server.Kestrel.Filter { public class StreamSocketOutput : ISocketOutput { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs index 2d38857005..e6f99c9d53 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ChunkWriter.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Text; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public static class ChunkWriter { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs index 96b6c0b93a..52790ec65a 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs @@ -4,12 +4,12 @@ using System; using System.Net; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Filter; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class Connection : ConnectionContext, IConnectionControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs index 4720aa40e5..3a624d3659 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ConnectionContext.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.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class ConnectionContext : ListenerContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs index 4a3cff6eb4..45e91194d6 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/DateHeaderValueManager.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Text; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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/Http/Frame.FeatureCollection.cs index 91aa90eb37..8a10a7c618 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs @@ -9,12 +9,12 @@ using System.Linq; using System.Net; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public partial class Frame : IFeatureCollection, IHttpRequestFeature, @@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { // NOTE: When feature interfaces are added to or removed from this Frame class implementation, // then the list of `implementedFeatures` in the generated code project MUST also be updated. - // See also: tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs + // See also: tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs private int _featureRevision; diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs index e449f94d83..49911c71cc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs @@ -2,26 +2,26 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public partial class Frame { - private static readonly Type IHttpRequestFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestFeature); - private static readonly Type IHttpResponseFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpResponseFeature); - private static readonly Type IHttpRequestIdentifierFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestIdentifierFeature); - private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNet.Http.Features.Internal.IServiceProvidersFeature); - private static readonly Type IHttpRequestLifetimeFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestLifetimeFeature); - private static readonly Type IHttpConnectionFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpConnectionFeature); - private static readonly Type IHttpAuthenticationFeatureType = typeof(global::Microsoft.AspNet.Http.Features.Authentication.IHttpAuthenticationFeature); - private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNet.Http.Features.Internal.IQueryFeature); - private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNet.Http.Features.Internal.IFormFeature); - private static readonly Type IHttpUpgradeFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpUpgradeFeature); - private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNet.Http.Features.Internal.IResponseCookiesFeature); - private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNet.Http.Features.Internal.IItemsFeature); - private static readonly Type ITlsConnectionFeatureType = typeof(global::Microsoft.AspNet.Http.Features.ITlsConnectionFeature); - private static readonly Type IHttpWebSocketFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpWebSocketFeature); - private static readonly Type ISessionFeatureType = typeof(global::Microsoft.AspNet.Http.Features.ISessionFeature); - private static readonly Type IHttpSendFileFeatureType = typeof(global::Microsoft.AspNet.Http.Features.IHttpSendFileFeature); + private static readonly Type IHttpRequestFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature); + private static readonly Type IHttpResponseFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature); + private static readonly Type IHttpRequestIdentifierFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature); + private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature); + private static readonly Type IHttpRequestLifetimeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature); + private static readonly Type IHttpConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature); + private static readonly Type IHttpAuthenticationFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature); + private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature); + private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature); + private static readonly Type IHttpUpgradeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature); + private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature); + private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature); + private static readonly Type ITlsConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature); + private static readonly Type IHttpWebSocketFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature); + private static readonly Type ISessionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature); + private static readonly Type IHttpSendFileFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpSendFileFeature); private object _currentIHttpRequestFeature; private object _currentIHttpResponseFeature; @@ -63,67 +63,67 @@ namespace Microsoft.AspNet.Server.Kestrel.Http private object FastFeatureGet(Type key) { - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature)) { return _currentIHttpRequestFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpResponseFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature)) { return _currentIHttpResponseFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestIdentifierFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature)) { return _currentIHttpRequestIdentifierFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IServiceProvidersFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature)) { return _currentIServiceProvidersFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestLifetimeFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature)) { return _currentIHttpRequestLifetimeFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpConnectionFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature)) { return _currentIHttpConnectionFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Authentication.IHttpAuthenticationFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature)) { return _currentIHttpAuthenticationFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IQueryFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature)) { return _currentIQueryFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IFormFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature)) { return _currentIFormFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpUpgradeFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature)) { return _currentIHttpUpgradeFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IResponseCookiesFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature)) { return _currentIResponseCookiesFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IItemsFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature)) { return _currentIItemsFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.ITlsConnectionFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature)) { return _currentITlsConnectionFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpWebSocketFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature)) { return _currentIHttpWebSocketFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.ISessionFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature)) { return _currentISessionFeature; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpSendFileFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpSendFileFeature)) { return _currentIHttpSendFileFeature; } @@ -134,82 +134,82 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { _featureRevision++; - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature)) { _currentIHttpRequestFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpResponseFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature)) { _currentIHttpResponseFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestIdentifierFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature)) { _currentIHttpRequestIdentifierFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IServiceProvidersFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature)) { _currentIServiceProvidersFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpRequestLifetimeFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature)) { _currentIHttpRequestLifetimeFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpConnectionFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature)) { _currentIHttpConnectionFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Authentication.IHttpAuthenticationFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature)) { _currentIHttpAuthenticationFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IQueryFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature)) { _currentIQueryFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IFormFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature)) { _currentIFormFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpUpgradeFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature)) { _currentIHttpUpgradeFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IResponseCookiesFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature)) { _currentIResponseCookiesFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.Internal.IItemsFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature)) { _currentIItemsFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.ITlsConnectionFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature)) { _currentITlsConnectionFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpWebSocketFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature)) { _currentIHttpWebSocketFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.ISessionFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature)) { _currentISessionFeature = feature; return; } - if (key == typeof(global::Microsoft.AspNet.Http.Features.IHttpSendFileFeature)) + if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IHttpSendFileFeature)) { _currentIHttpSendFileFeature = feature; return; @@ -221,67 +221,67 @@ namespace Microsoft.AspNet.Server.Kestrel.Http { if (_currentIHttpRequestFeature != null) { - yield return new KeyValuePair(IHttpRequestFeatureType, _currentIHttpRequestFeature as global::Microsoft.AspNet.Http.Features.IHttpRequestFeature); + yield return new KeyValuePair(IHttpRequestFeatureType, _currentIHttpRequestFeature as global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature); } if (_currentIHttpResponseFeature != null) { - yield return new KeyValuePair(IHttpResponseFeatureType, _currentIHttpResponseFeature as global::Microsoft.AspNet.Http.Features.IHttpResponseFeature); + yield return new KeyValuePair(IHttpResponseFeatureType, _currentIHttpResponseFeature as global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature); } if (_currentIHttpRequestIdentifierFeature != null) { - yield return new KeyValuePair(IHttpRequestIdentifierFeatureType, _currentIHttpRequestIdentifierFeature as global::Microsoft.AspNet.Http.Features.IHttpRequestIdentifierFeature); + yield return new KeyValuePair(IHttpRequestIdentifierFeatureType, _currentIHttpRequestIdentifierFeature as global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature); } if (_currentIServiceProvidersFeature != null) { - yield return new KeyValuePair(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNet.Http.Features.Internal.IServiceProvidersFeature); + yield return new KeyValuePair(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature); } if (_currentIHttpRequestLifetimeFeature != null) { - yield return new KeyValuePair(IHttpRequestLifetimeFeatureType, _currentIHttpRequestLifetimeFeature as global::Microsoft.AspNet.Http.Features.IHttpRequestLifetimeFeature); + yield return new KeyValuePair(IHttpRequestLifetimeFeatureType, _currentIHttpRequestLifetimeFeature as global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature); } if (_currentIHttpConnectionFeature != null) { - yield return new KeyValuePair(IHttpConnectionFeatureType, _currentIHttpConnectionFeature as global::Microsoft.AspNet.Http.Features.IHttpConnectionFeature); + yield return new KeyValuePair(IHttpConnectionFeatureType, _currentIHttpConnectionFeature as global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature); } if (_currentIHttpAuthenticationFeature != null) { - yield return new KeyValuePair(IHttpAuthenticationFeatureType, _currentIHttpAuthenticationFeature as global::Microsoft.AspNet.Http.Features.Authentication.IHttpAuthenticationFeature); + yield return new KeyValuePair(IHttpAuthenticationFeatureType, _currentIHttpAuthenticationFeature as global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature); } if (_currentIQueryFeature != null) { - yield return new KeyValuePair(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNet.Http.Features.Internal.IQueryFeature); + yield return new KeyValuePair(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature); } if (_currentIFormFeature != null) { - yield return new KeyValuePair(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNet.Http.Features.Internal.IFormFeature); + yield return new KeyValuePair(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature); } if (_currentIHttpUpgradeFeature != null) { - yield return new KeyValuePair(IHttpUpgradeFeatureType, _currentIHttpUpgradeFeature as global::Microsoft.AspNet.Http.Features.IHttpUpgradeFeature); + yield return new KeyValuePair(IHttpUpgradeFeatureType, _currentIHttpUpgradeFeature as global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature); } if (_currentIResponseCookiesFeature != null) { - yield return new KeyValuePair(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNet.Http.Features.Internal.IResponseCookiesFeature); + yield return new KeyValuePair(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature); } if (_currentIItemsFeature != null) { - yield return new KeyValuePair(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNet.Http.Features.Internal.IItemsFeature); + yield return new KeyValuePair(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature); } if (_currentITlsConnectionFeature != null) { - yield return new KeyValuePair(ITlsConnectionFeatureType, _currentITlsConnectionFeature as global::Microsoft.AspNet.Http.Features.ITlsConnectionFeature); + yield return new KeyValuePair(ITlsConnectionFeatureType, _currentITlsConnectionFeature as global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature); } if (_currentIHttpWebSocketFeature != null) { - yield return new KeyValuePair(IHttpWebSocketFeatureType, _currentIHttpWebSocketFeature as global::Microsoft.AspNet.Http.Features.IHttpWebSocketFeature); + yield return new KeyValuePair(IHttpWebSocketFeatureType, _currentIHttpWebSocketFeature as global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature); } if (_currentISessionFeature != null) { - yield return new KeyValuePair(ISessionFeatureType, _currentISessionFeature as global::Microsoft.AspNet.Http.Features.ISessionFeature); + yield return new KeyValuePair(ISessionFeatureType, _currentISessionFeature as global::Microsoft.AspNetCore.Http.Features.ISessionFeature); } if (_currentIHttpSendFileFeature != null) { - yield return new KeyValuePair(IHttpSendFileFeatureType, _currentIHttpSendFileFeature as global::Microsoft.AspNet.Http.Features.IHttpSendFileFeature); + yield return new KeyValuePair(IHttpSendFileFeatureType, _currentIHttpSendFileFeature as global::Microsoft.AspNetCore.Http.Features.IHttpSendFileFeature); } if (MaybeExtra != null) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs index efbd159c7f..d5225447d1 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs @@ -10,15 +10,15 @@ using System.Numerics; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; // ReSharper disable AccessToModifiedClosure -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public abstract partial class Frame : FrameContext, IFrameControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameContext.cs index ab43df6388..e4db400124 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameContext.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.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class FrameContext : ConnectionContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs index d421be7e0d..7b904b15b3 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameDuplexStream.cs @@ -8,7 +8,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { class FrameDuplexStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs index d0a5561d1f..8a36b78d50 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.Generated.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Text; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public partial class FrameRequestHeaders diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs index a97a092098..45c9355349 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs @@ -5,10 +5,10 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public abstract class FrameHeaders : IHeaderDictionary { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs index 32b067fc76..0f3d8d48d6 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Net; using System.Threading.Tasks; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class Frame : Frame { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs index 731b449468..a90626f0ea 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestHeaders.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Primitives; using System.Collections; using System.Collections.Generic; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public partial class FrameRequestHeaders : FrameHeaders { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs index ba0c2062f7..dc70690b32 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs @@ -6,7 +6,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class FrameRequestStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs index 840d44ce8b..08b9deca0e 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseHeaders.cs @@ -3,10 +3,10 @@ using System.Collections; using System.Collections.Generic; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public partial class FrameResponseHeaders : FrameHeaders { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs index e544723af4..f45470f555 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs @@ -6,7 +6,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { class FrameResponseStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs index 12c393ee1a..8f92bad5b9 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameStreamState.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { enum FrameStreamState { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs index c6e2f7ec04..6da7cac561 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IConnectionControl.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/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.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public interface IConnectionControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs index 6871236b8b..f8ecbab894 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/IFrameControl.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public interface IFrameControl { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs index 4d9a083576..20e20481d3 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ISocketOutput.cs @@ -4,9 +4,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { /// /// Operations performed for buffered socket output diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs index 3455f93567..d4137ad369 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Listener.cs @@ -3,10 +3,10 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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/Http/ListenerContext.cs index 7247afa2bd..692759e7d8 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/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.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class ListenerContext : ServiceContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs index 04257ab015..e9af35d142 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerPrimary.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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/Http/ListenerSecondary.cs index d3cd04a6f0..b20c35ebc8 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs @@ -5,12 +5,12 @@ using System; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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/Http/MessageBody.cs index 812ea97b94..ce9f4aa9cc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/MessageBody.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public abstract class MessageBody { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs index c7e545a549..9e6849087f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListener.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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/Http/PipeListenerPrimary.cs index 7d907e20c2..6454fb6f58 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerPrimary.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { /// /// An implementation of using UNIX sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs index a9c3f70529..3ca23ea6fc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/PipeListenerSecondary.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Networking; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { /// /// An implementation of using UNIX sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs index 4df5ed4e48..8e4831ffa2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ProduceEndType.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/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.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public enum ProduceEndType { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs index f162ebb9fc..7aae44b815 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/ReasonPhrases.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.Text; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public static class ReasonPhrases { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs index 944457af60..94e335b345 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInput.cs @@ -5,9 +5,9 @@ using System; using System.IO; using System.Runtime.CompilerServices; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class SocketInput : ICriticalNotifyCompletion { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs index d514c3893f..4b3beab538 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketInputExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public static class SocketInputExtensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs index 3c39954494..15a56f9fc8 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/SocketOutput.cs @@ -7,11 +7,11 @@ using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class SocketOutput : ISocketOutput { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs index 61f4a4fe0e..113f9f69b7 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListener.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/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.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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/Http/TcpListenerPrimary.cs index 98283232cd..6721e8b012 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerPrimary.cs @@ -3,11 +3,11 @@ using System; using System.Net; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { /// /// An implementation of using TCP sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs index 9a36f2b171..ce0616171b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/TcpListenerSecondary.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Networking; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { /// /// An implementation of using TCP sockets. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs index 66608a4a22..60f83303f1 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/UrlPathDecoder.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http { public class UrlPathDecoder { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/IKestrelServerInformation.cs b/src/Microsoft.AspNetCore.Server.Kestrel/IKestrelServerInformation.cs index 3a634afae8..a08db08ea6 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/IKestrelServerInformation.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/IKestrelServerInformation.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.AspNet.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Kestrel.Filter; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { public interface IKestrelServerInformation { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs index 9b72df3361..098db13c79 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Constants.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { internal class Constants { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs index 04d2dac312..5d3b53c9df 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/Disposable.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { /// /// Summary description for Disposable diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs index 7c5776fcc4..1cab425247 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs @@ -1,7 +1,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { public interface IKestrelTrace : ILogger { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs index c741621de4..1818f68fd2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/ISystemClock.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.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/Infrastructure/IThreadPool.cs index fde95f4241..404bc01a55 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IThreadPool.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { public interface IThreadPool { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs index 0e4548babc..82c6f11f0a 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { /// /// Summary description for KestrelThread diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs index 1bfd402993..f9b82ce25b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.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.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { /// /// Summary description for KestrelTrace diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs index 967787dc1f..70f142f536 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/LoggingThreadPool.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { public class LoggingThreadPool : IThreadPool { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool2.cs index f915123562..c7a2899b69 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool2.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPool2.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Concurrent; using System.Diagnostics; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { /// /// Used to allocate and distribute re-usable blocks of memory. diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs index 26156c6cc0..905e3c3464 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolBlock2.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.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/MemoryPoolIterator2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs index 37e18389ff..62b19ced94 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Diagnostics; using System.Numerics; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { public struct MemoryPoolIterator2 { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs index 3bb2b6c8c2..70dc2cf8fc 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolIterator2Extensions.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Diagnostics; using System.Text; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { public static class MemoryPoolIterator2Extensions { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs index 134bc147d2..c7062d0977 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/MemoryPoolSlab2.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.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/SystemClock.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs index c16d40bf6a..1718890eea 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/SystemClock.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.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/Infrastructure/TaskUtilities.cs index c0c4c11acc..a59713eeaa 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/TaskUtilities.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Server.Kestrel.Infrastructure +namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure { public static class TaskUtilities { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs index d64f4316e9..40c3359558 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelEngine.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Networking; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { public class KestrelEngine : ServiceContext, IDisposable { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs index 34cef6394b..fed5bea660 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs @@ -1,16 +1,16 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { public class KestrelServer : IServer { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerInformation.cs b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerInformation.cs index 8ff73cc03e..6f05a1da58 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerInformation.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerInformation.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.Globalization; -using Microsoft.AspNet.Server.Features; -using Microsoft.AspNet.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Features; +using Microsoft.AspNetCore.Server.Kestrel.Filter; using Microsoft.Extensions.Configuration; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { public class KestrelServerInformation : IKestrelServerInformation, IServerAddressesFeature { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs index abe9aa1d56..037f77eaa2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/Libuv.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class Libuv { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs index a1915ff372..be22ef7120 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/PlatformApis.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; using Microsoft.Extensions.PlatformAbstractions; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public static class PlatformApis { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs index 762b1f5140..29c850df84 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/SockAddr.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Net; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public struct SockAddr { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs index 32f629c713..d78973a847 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvAsyncHandle.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.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class UvAsyncHandle : UvHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs index 086c52de77..1ceb8f9e51 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/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.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { /// /// Summary description for UvWriteRequest diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs index 2a6d5bce1d..a63da72eba 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvException.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class UvException : Exception { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs index 60c3ba03c8..65f3c43580 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvHandle.cs @@ -3,9 +3,9 @@ using System; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public abstract class UvHandle : UvMemory { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs index 75a4bbfdc4..3cf357af9b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvLoopHandle.cs @@ -3,9 +3,9 @@ using System; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class UvLoopHandle : UvHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs index 3f2bf13a28..c9a62462cf 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvMemory.cs @@ -5,9 +5,9 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { /// /// Summary description for UvMemory diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs index 5205eb5f9b..af143536a4 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvPipeHandle.cs @@ -3,9 +3,9 @@ using System; using System.Net; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class UvPipeHandle : UvStreamHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs index 4005129cec..87fe48c726 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvRequest.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Runtime.InteropServices; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class UvRequest : UvMemory { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs index d6aa2c65ad..0342b3d25f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvShutdownReq.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/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.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { /// /// Summary description for UvShutdownRequest diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs index bfbdabfef6..e60de40d3b 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs @@ -3,10 +3,10 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public abstract class UvStreamHandle : UvHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs index cc568cc503..ec201a3627 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvTcpHandle.cs @@ -4,9 +4,9 @@ using System; using System.Net; using System.Runtime.InteropServices; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { public class UvTcpHandle : UvStreamHandle { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs index 21a1aaf778..cdefbdaf9c 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel.Networking +namespace Microsoft.AspNetCore.Server.Kestrel.Networking { /// /// Summary description for UvWriteRequest diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs index a8f71a20f0..24e236d5f2 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Properties/AssemblyInfo.cs @@ -5,6 +5,6 @@ using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNet.Server.KestrelTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.KestrelTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-us")] diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs index 1c2e2d00e6..4bbc6dc9c5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Diagnostics; using System.Globalization; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { public class ServerAddress { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/ServerFactory.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServerFactory.cs index d7f95ce25c..06a7fb3686 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/ServerFactory.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/ServerFactory.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Features; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Features; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { /// /// Summary description for ServerFactory @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Server.Kestrel var serverFeatures = new FeatureCollection(); serverFeatures.Set(information); serverFeatures.Set(information); - return new KestrelServer(serverFeatures, _appLifetime, _loggerFactory.CreateLogger("Microsoft.AspNet.Server.Kestrel")); + return new KestrelServer(serverFeatures, _appLifetime, _loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel")); } } } diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs b/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs index 4bab512ced..a299ff9461 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/ServiceContext.cs @@ -1,15 +1,15 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Net; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Filter; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.Kestrel +namespace Microsoft.AspNetCore.Server.Kestrel { public class ServiceContext { diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/project.json b/src/Microsoft.AspNetCore.Server.Kestrel/project.json index 8fce00cce0..dcf935bc9f 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/project.json +++ b/src/Microsoft.AspNetCore.Server.Kestrel/project.json @@ -6,7 +6,7 @@ "url": "git://github.com/aspnet/kestrelhttpserver" }, "dependencies": { - "Microsoft.AspNet.Hosting": "1.0.0-*", + "Microsoft.AspNetCore.Hosting": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "System.Numerics.Vectors": "4.1.1-*", @@ -14,11 +14,11 @@ "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNet.Internal.libuv-Darwin": { + "Microsoft.AspNetCore.Internal.libuv-Darwin": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNet.Internal.libuv-Windows": { + "Microsoft.AspNetCore.Internal.libuv-Windows": { "version": "1.0.0-*", "type": "build" }, @@ -53,12 +53,12 @@ }, "scripts": { "prepare": [ - "dnu restore ../../tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode", - "dnx -p ../../tools/Microsoft.AspNet.Server.Kestrel.GeneratedCode run Http/FrameHeaders.Generated.cs Http/Frame.Generated.cs" + "dnu restore ../../tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode", + "dnx -p ../../tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode run Http/FrameHeaders.Generated.cs Http/Frame.Generated.cs" ], "postrestore": [ - "dnu restore ../../tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier", - "dnx -p ../../tools/Microsoft.AspNet.Server.Kestrel.LibuvCopier run" + "dnu restore ../../tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier", + "dnx -p ../../tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier run" ] }, "packInclude": { diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs index c553af03b0..ea09bfb879 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs @@ -1,18 +1,18 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Extensions; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Extensions; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Configuration; using Xunit; -namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public class AddressRegistrationTests { @@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var hostBuilder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(ConfigureEchoAddress); using (var host = hostBuilder.Build()) diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs index 5d8d8a0d6b..cafe02d229 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/IPv6SupportedConditionAttribute.cs @@ -4,9 +4,9 @@ using System; using System.Net; using System.Net.Sockets; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class IPv6SupportedConditionAttribute : Attribute, ITestCondition diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj index d8807f6583..01f50a011e 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 9559a5f1-080c-4909-b6cf-7e4b3dc55748 - Microsoft.AspNet.Server.Kestrel.FunctionalTests + Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/PathBaseTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/PathBaseTests.cs index e44a651c4c..be427bcb40 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/PathBaseTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/PathBaseTests.cs @@ -1,19 +1,19 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; -namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public class PathBaseTests { @@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(async context => diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs index 1beb9fd4a5..31e8ce1e22 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs @@ -1,20 +1,20 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Globalization; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; -namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public class RequestTests { @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -102,7 +102,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -134,7 +134,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var builder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(async context => diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs index d4f6b529aa..0708c09388 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -7,15 +7,15 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Primitives; using Xunit; -namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public class ResponseTests { @@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var hostBuilder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -92,7 +92,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var hostBuilder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(async context => @@ -143,7 +143,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var hostBuilder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { app.Run(context => diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs index 0d4324926b..cd88cf2f8c 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs @@ -1,16 +1,16 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Xunit; -namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public class ThreadCountTests { @@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests var hostBuilder = new WebHostBuilder() .UseConfiguration(config) - .UseServer("Microsoft.AspNet.Server.Kestrel") + .UseServer("Microsoft.AspNetCore.Server.Kestrel") .Configure(app => { var serverInfo = app.ServerFeatures.Get(); diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json index 1e06cdc21b..cd1a77f780 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json @@ -1,9 +1,9 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Http.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "System.Net.Http": "4.0.1-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoder.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoder.cs index 245eeee086..4664053bf8 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoder.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/AsciiDecoder.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Linq; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class AsciiDecoderTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs index 3a2dd71030..af70086103 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkWriterTests.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; using System.Text; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Http; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class ChunkWriterTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs index ad0a9120c9..42a08006f2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/ChunkedResponseTests.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class ChunkedResponseTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs index d0947f8d4c..1eef8a6c5c 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/ConnectionFilterTests.cs @@ -1,16 +1,16 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Filter; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class ConnectionFilterTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs index e8a14e55b8..7c097f66e8 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/CreateIPEndpointTests.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Net; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class CreateIPEndpointTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs index ef5e31ca6d..d357ece6ae 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/DateHeaderValueManagerTests.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.KestrelTests.TestHelpers; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class DateHeaderValueManagerTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/DummyApplication.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/DummyApplication.cs index 540b9d2f47..c1ef6f86b7 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/DummyApplication.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/DummyApplication.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class DummyApplication : IHttpApplication { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs index b18736daa8..a44f096129 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -9,16 +9,16 @@ using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Filter; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { /// /// Summary description for EngineTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameFacts.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameFacts.cs index 400b6ac42d..deefd5511d 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameFacts.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameFacts.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class FrameFacts { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs index 0206fcada2..314ee32aa3 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestHeadersTests.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Http; using Microsoft.Extensions.Primitives; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class FrameRequestHeadersTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs index 1526c53b26..5fa4f6bec2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs @@ -3,12 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; using Microsoft.Extensions.Primitives; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class FrameResponseHeadersTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs index 5960510eff..20fb2ad932 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs @@ -4,12 +4,12 @@ using System; using System.Linq; using System.Text; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class FrameTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs index 1f7ca8c4d2..7749164bd2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -11,14 +11,14 @@ using System.Net.Sockets; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel.Filter; -using Microsoft.AspNet.Server.Kestrel.Https; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Kestrel.Https; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class HttpsConnectionFilterTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerInformationTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerInformationTests.cs index e2376c0d94..9818d9d426 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerInformationTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerInformationTests.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; -using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel; using Microsoft.Extensions.Configuration; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class KestrelServerInformationTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs index 23e2ff68a7..d54202dc9d 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs @@ -1,15 +1,15 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Hosting.Server; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Configuration; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class KestrelServerTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/LifetimeNotImplemented.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/LifetimeNotImplemented.cs index e014424b41..feba1c80fd 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/LifetimeNotImplemented.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/LifetimeNotImplemented.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Hosting; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class LifetimeNotImplemented : IApplicationLifetime { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlock2Tests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlock2Tests.cs index 2cbd077180..8411df9a39 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlock2Tests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolBlock2Tests.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Linq; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using System.Numerics; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class MemoryPoolBlock2Tests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs index 1eb6830889..d822185aee 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolExtensions.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public static class MemoryPoolExtensions { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIterator2Tests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIterator2Tests.cs index 627cd0dfa2..046f032fc2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIterator2Tests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MemoryPoolIterator2Tests.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Linq; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using System.Numerics; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class MemoryPoolIterator2Tests : IDisposable { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs index f93c144c8f..9811de2ec7 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MessageBodyTests.cs @@ -4,10 +4,10 @@ using System; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Http; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { /// /// Summary description for MessageBodyTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs index 44a5757f80..6c4d2e8ed0 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/MultipleLoopTests.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class MultipleLoopTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs index edaa50870e..86b2f8fe5a 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs @@ -6,12 +6,12 @@ using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Networking; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { /// /// Summary description for NetworkingTests diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/Program.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/Program.cs index 0b825ad664..4f4b5827c6 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/Program.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/Program.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using Microsoft.Extensions.PlatformAbstractions; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { /// /// Summary description for Program diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressFacts.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressFacts.cs index 1a77598a83..9738dac675 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressFacts.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressFacts.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class ServerAddressFacts { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs index 5a38bf87ef..f9d1f7ac22 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketInputTests.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class SocketInputTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs index bda6bfb651..01c42c5f18 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs @@ -1,18 +1,18 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; -using Microsoft.AspNet.Server.Kestrel.Networking; -using Microsoft.AspNet.Server.KestrelTests.TestHelpers; +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.KestrelTests.TestHelpers; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class SocketOutputTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs index 7b19bf6173..e787ed8589 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/StreamSocketOutputTests.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.IO; -using Microsoft.AspNet.Server.Kestrel.Filter; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Filter; +using Microsoft.AspNetCore.Server.Kestrel.Http; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class StreamSocketOutputTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs index e47c2fc319..268eaa7b78 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestConnection.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { /// /// Summary description for TestConnection diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestDateHeaderValueManager.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestDateHeaderValueManager.cs index c69221b0ce..f558080e9d 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestDateHeaderValueManager.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestDateHeaderValueManager.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Http; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class TestDateHeaderValueManager : DateHeaderValueManager { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs index 9a05659186..4cc9549d78 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockLibuv.cs @@ -1,8 +1,8 @@ using System; using System.Threading; -using Microsoft.AspNet.Server.Kestrel.Networking; +using Microsoft.AspNetCore.Server.Kestrel.Networking; -namespace Microsoft.AspNet.Server.KestrelTests.TestHelpers +namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { public class MockLibuv : Libuv { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs index 6dbf6e3556..75c8951e60 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockSystemClock.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.KestrelTests.TestHelpers +namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers { public class MockSystemClock : ISystemClock { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs index 14c3213903..d1e89a85b4 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestInput.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { class TestInput : IConnectionControl, IFrameControl { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs index b9123285d9..2697a4b7ef 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs @@ -1,8 +1,8 @@ using System; -using Microsoft.AspNet.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class TestKestrelTrace : KestrelTrace { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs index 42efcb3793..72fbf28f47 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServer.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { /// /// Summary description for TestServer diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs index 54dfc3c3b3..4224c776d3 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/TestServiceContext.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Server.Kestrel; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.Kestrel; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class TestServiceContext : ServiceContext { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs index 02769fd01f..e8a64e2497 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/UrlPathDecoder.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Linq; -using Microsoft.AspNet.Server.Kestrel.Http; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Http; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Xunit; -namespace Microsoft.AspNet.Server.KestrelTests +namespace Microsoft.AspNetCore.Server.KestrelTests { public class UrlPathDecoderTests { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json index 4060d91d5e..e788721ede 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/project.json +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/project.json @@ -2,9 +2,9 @@ "version": "1.0.0-*", "dependencies": { "xunit.runner.aspnet": "2.0.0-aspnet-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel.Https": "1.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "System.Net.Http": "4.0.1-*" }, "frameworks": { @@ -23,7 +23,7 @@ "keyFile": "../../tools/Key.snk" }, "commands": { - "run": "Microsoft.AspNet.Server.KestrelTests", + "run": "Microsoft.AspNetCore.Server.KestrelTests", "test": "xunit.runner.aspnet -parallel none" } } diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs index e32e54c133..a84d3a9c59 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs @@ -1,12 +1,12 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Dnx.Compilation.CSharp; -using Microsoft.AspNet.Http.Features.Internal; -using Microsoft.AspNet.Http.Features.Authentication; +using Microsoft.AspNetCore.Http.Features.Internal; +using Microsoft.AspNetCore.Http.Features.Authentication; -namespace Microsoft.AspNet.Server.Kestrel.GeneratedCode +namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode { // This project can output the Class library as a NuGet Package. // To enable this option, right-click on the project and select the Properties menu item. In the Build tab select "Produce outputs on build". @@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Server.Kestrel.GeneratedCode var allFeatures = alwaysFeatures.Concat(commonFeatures).Concat(sometimesFeatures).Concat(rareFeatures); // NOTE: This list MUST always match the set of feature interfaces implemented by Frame. - // See also: src/Microsoft.AspNet.Server.Kestrel/Http/Frame.FeatureCollection.cs + // See also: src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs var implementedFeatures = new[] { typeof(IHttpRequestFeature), @@ -74,7 +74,7 @@ namespace Microsoft.AspNet.Server.Kestrel.GeneratedCode using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.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 9f7c720156..359baa98c3 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs @@ -4,7 +4,7 @@ using System.Linq; using Microsoft.Dnx.Compilation.CSharp; using System.Text; -namespace Microsoft.AspNet.Server.Kestrel.GeneratedCode +namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode { // This project can output the Class library as a NuGet Package. // To enable this option, right-click on the project and select the Properties menu item. In the Build tab select "Produce outputs on build". @@ -205,10 +205,10 @@ namespace Microsoft.AspNet.Server.Kestrel.GeneratedCode using System; using System.Collections.Generic; using System.Text; -using Microsoft.AspNet.Server.Kestrel.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Infrastructure; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.Server.Kestrel.Http +namespace Microsoft.AspNetCore.Server.Kestrel.Http {{ {Each(loops, loop => $@" public partial class {loop.ClassName} diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj index 12a75e7f62..f539350093 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ bd2d4d29-1bd9-40d0-bb31-337d5416b63c - Microsoft.AspNet.Server.Kestrel.GeneratedCode + Microsoft.AspNetCore.Server.Kestrel.GeneratedCode ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs index 3727772c03..b146bb58d1 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.IO; -namespace Microsoft.AspNet.Server.Kestrel.GeneratedCode +namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode { public class Program { diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json index ede3a70f54..67117cd620 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Http.Features": "1.0.0-*", - "Microsoft.AspNet.Hosting": "1.0.0-*" + "Microsoft.AspNetCore.Http.Features": "1.0.0-*", + "Microsoft.AspNetCore.Hosting": "1.0.0-*" }, "commands": { - "run": "Microsoft.AspNet.Server.Kestrel.GeneratedCode" + "run": "Microsoft.AspNetCore.Server.Kestrel.GeneratedCode" }, "frameworks": { diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj index bb7fe23a81..2e3d5e6e7b 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ 8cba6fe3-3cc9-4420-8aa3-123e983734c2 - Microsoft.AspNet.Server.Kestrel.LibuvCopier + Microsoft.AspNetCore.Server.Kestrel.LibuvCopier ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs index b76dd16fe8..6fb635145a 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/Program.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.IO; using System.Linq; using Newtonsoft.Json.Linq; -namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier +namespace Microsoft.AspNetCore.Server.Kestrel.LibuvCopier { public class Program { @@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier var lockJson = JObject.Parse(File.ReadAllText("project.lock.json")); foreach (var libuvLib in lockJson["libraries"].OfType().Where( - p => p.Name.StartsWith("Microsoft.AspNet.Internal.libuv", StringComparison.Ordinal))) + p => p.Name.StartsWith("Microsoft.AspNetCore.Internal.libuv", StringComparison.Ordinal))) { foreach (var filePath in libuvLib.Value["files"].Select(v => v.Value())) { diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json index a9b68f0ec4..76f2bc1459 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json +++ b/tools/Microsoft.AspNetCore.Server.Kestrel.LibuvCopier/project.json @@ -1,6 +1,6 @@ { "version": "1.0.0-*", - "description": "Microsoft.AspNet.Server.Kestrel.LibuvCopier Console Application", + "description": "Microsoft.AspNetCore.Server.Kestrel.LibuvCopier Console Application", "authors": [ "pawelka" ], "tags": [ "" ], "projectUrl": "", @@ -12,7 +12,7 @@ }, "commands": { - "Microsoft.AspNet.Server.Kestrel.LibuvCopier": "Microsoft.AspNet.Server.Kestrel.LibuvCopier" + "Microsoft.AspNetCore.Server.Kestrel.LibuvCopier": "Microsoft.AspNetCore.Server.Kestrel.LibuvCopier" }, "frameworks": {