diff --git a/.travis.yml b/.travis.yml index 70902067d3..73fb758d81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,4 +28,4 @@ before_install: - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi script: - ./build.sh - - if test "$TRAVIS_OS_NAME" != "osx"; then bash test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh; fi + - if test "$TRAVIS_OS_NAME" != "osx"; then bash test/Kestrel.FunctionalTests/SystemdActivation/docker.sh; fi diff --git a/.vscode/tasks.json b/.vscode/tasks.json index af0e4b2245..97f0b7ad07 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,13 +7,13 @@ }, // requires that you first run build.cmd or build.sh to install local builds of dotnet "windows": { - "command": "${env.LOCALAPPDATA}/Microsoft/dotnet/dotnet.exe" + "command": "${env:USERPROFILE}/.dotnet/x64/dotnet.exe" }, "osx": { - "command": "${env.HOME}/.dotnet/dotnet" + "command": "${env:HOME}/.dotnet/dotnet" }, "linux": { - "command": "${env.HOME}/.dotnet/dotnet" + "command": "${env:HOME}/.dotnet/dotnet" }, "suppressTaskName": true, "tasks": [ @@ -25,10 +25,17 @@ }, { "taskName": "Compile: solution", - "isBuildCommand": true, + "group": { + "isDefault": true, + "kind": "build" + }, + "presentation": { + "panel": "dedicated" + }, "args": [ "build", - "${workspaceRoot}/KestrelHttpServer.sln" + "${workspaceRoot}/KestrelHttpServer.sln", + "/p:GenerateFullPaths=true" ], "problemMatcher": "$msCompile", // these have to defined here because of https://github.com/Microsoft/vscode/issues/20740 @@ -37,14 +44,14 @@ "env": { // The location of .NET Framework reference assembiles. // These may not be installed yet if you have not run build.sh. - "ReferenceAssemblyRoot": "${env.HOME}/.nuget/packages/netframeworkreferenceassemblies/4.6.1/content" + "ReferenceAssemblyRoot": "${env:HOME}/.dotnet/buildtools/netfx/4.6.1/" } } }, "linux": { "options": { "env": { - "ReferenceAssemblyRoot": "${env.HOME}/.nuget/packages/netframeworkreferenceassemblies/4.6.1/content" + "ReferenceAssemblyRoot": "${env:HOME}/.dotnet/buildtools/netfx/4.6.1/" } } } @@ -52,15 +59,17 @@ { "taskName": "Test", "args": [ - "test" + "test", + "/p:GenerateFullPaths=true" ], "problemMatcher": "$msCompile", - "isTestCommand": true + "group": "test" }, { "taskName": "Compile: CodeGenerator", "args": [ - "build" + "build", + "/p:GenerateFullPaths=true" ], "options": { "cwd": "${workspaceRoot}/tools/CodeGenerator/" @@ -101,7 +110,7 @@ "Release" ], "options": { - "cwd": "${workspaceRoot}/test/Microsoft.AspNetCore.Server.Kestrel.Performance/" + "cwd": "${workspaceRoot}/test/Kestrel.Performance/" } } ] diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index a5e8db2e49..4c9791d022 100644 --- a/KestrelHttpServer.sln +++ b/KestrelHttpServer.sln @@ -36,9 +36,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{0EF2AC test\shared\TestServiceContext.cs = test\shared\TestServiceContext.cs EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "src\Microsoft.AspNetCore.Server.Kestrel.Core\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Core", "src\Kestrel.Core\Kestrel.Core.csproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core.Tests", "test\Microsoft.AspNetCore.Server.Kestrel.Core.Tests\Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj", "{37F3BFB2-6454-49E5-9D7F-581BF755CCFE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Core.Tests", "test\Kestrel.Core.Tests\Kestrel.Core.Tests.csproj", "{37F3BFB2-6454-49E5-9D7F-581BF755CCFE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}" EndProject @@ -46,11 +46,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LargeResponseApp", "samples EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerator", "tools\CodeGenerator\CodeGenerator.csproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "src\Microsoft.AspNetCore.Server.Kestrel.Https\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{5F64B3C3-0C2E-431A-B820-A81BBFC863DA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Https", "src\Kestrel.Https\Kestrel.Https.csproj", "{5F64B3C3-0C2E-431A-B820-A81BBFC863DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.FunctionalTests", "test\Microsoft.AspNetCore.Server.Kestrel.FunctionalTests\Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj", "{9559A5F1-080C-4909-B6CF-7E4B3DC55748}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.FunctionalTests", "test\Kestrel.FunctionalTests\Kestrel.FunctionalTests.csproj", "{9559A5F1-080C-4909-B6CF-7E4B3DC55748}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Performance", "test\Microsoft.AspNetCore.Server.Kestrel.Performance\Microsoft.AspNetCore.Server.Kestrel.Performance.csproj", "{EBFE9719-A44B-4978-A71F-D5C254E7F35A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Performance", "test\Kestrel.Performance\Kestrel.Performance.csproj", "{EBFE9719-A44B-4978-A71F-D5C254E7F35A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestCertificates", "TestCertificates", "{2822C132-BFFB-4D53-AC5B-E7E47DD81A6E}" ProjectSection(SolutionItems) = preProject @@ -68,17 +68,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestCertificates", "TestCer test\shared\TestCertificates\testCert.pfx = test\shared\TestCertificates\testCert.pfx EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv", "src\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj", "{A76B8C8C-0DC5-4DD3-9B1F-02E51A0915F4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Transport.Libuv", "src\Kestrel.Transport.Libuv\Kestrel.Transport.Libuv.csproj", "{A76B8C8C-0DC5-4DD3-9B1F-02E51A0915F4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "src\Microsoft.AspNetCore.Server.Kestrel\Microsoft.AspNetCore.Server.Kestrel.csproj", "{56139957-5C29-4E7D-89BD-7D20598B4EAF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel", "src\Kestrel\Kestrel.csproj", "{56139957-5C29-4E7D-89BD-7D20598B4EAF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{6950B18F-A3D2-41A4-AFEC-8B7C49517611}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Transport.Sockets", "src\Kestrel.Transport.Sockets\Kestrel.Transport.Sockets.csproj", "{6950B18F-A3D2-41A4-AFEC-8B7C49517611}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{2E9CB89D-EC8F-4DD9-A72B-08D5BABF752D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Transport.Abstractions", "src\Kestrel.Transport.Abstractions\Kestrel.Transport.Abstractions.csproj", "{2E9CB89D-EC8F-4DD9-A72B-08D5BABF752D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests", "test\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj", "{D95A7EC3-48AC-4D03-B2E2-0DA3E13BD3A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Transport.Libuv.Tests", "test\Kestrel.Transport.Libuv.Tests\Kestrel.Transport.Libuv.Tests.csproj", "{D95A7EC3-48AC-4D03-B2E2-0DA3E13BD3A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Tests", "test\Microsoft.AspNetCore.Server.Kestrel.Tests\Microsoft.AspNetCore.Server.Kestrel.Tests.csproj", "{4F1C30F8-CCAA-48D7-9DF6-2A84021F5BCC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Tests", "test\Kestrel.Tests\Kestrel.Tests.csproj", "{4F1C30F8-CCAA-48D7-9DF6-2A84021F5BCC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/repo.props b/build/repo.props index a5d5b0f21d..c1b53db759 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,5 +1,5 @@ - + diff --git a/samples/LargeResponseApp/LargeResponseApp.csproj b/samples/LargeResponseApp/LargeResponseApp.csproj index 1649a43c54..a53054ca27 100644 --- a/samples/LargeResponseApp/LargeResponseApp.csproj +++ b/samples/LargeResponseApp/LargeResponseApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index fbd339a9ac..d08c315d06 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/AdaptedPipeline.cs b/src/Kestrel.Core/Adapter/Internal/AdaptedPipeline.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/AdaptedPipeline.cs rename to src/Kestrel.Core/Adapter/Internal/AdaptedPipeline.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/ConnectionAdapterContext.cs b/src/Kestrel.Core/Adapter/Internal/ConnectionAdapterContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/ConnectionAdapterContext.cs rename to src/Kestrel.Core/Adapter/Internal/ConnectionAdapterContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/IAdaptedConnection.cs b/src/Kestrel.Core/Adapter/Internal/IAdaptedConnection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/IAdaptedConnection.cs rename to src/Kestrel.Core/Adapter/Internal/IAdaptedConnection.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/IConnectionAdapter.cs b/src/Kestrel.Core/Adapter/Internal/IConnectionAdapter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/IConnectionAdapter.cs rename to src/Kestrel.Core/Adapter/Internal/IConnectionAdapter.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingConnectionAdapter.cs b/src/Kestrel.Core/Adapter/Internal/LoggingConnectionAdapter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingConnectionAdapter.cs rename to src/Kestrel.Core/Adapter/Internal/LoggingConnectionAdapter.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingStream.cs b/src/Kestrel.Core/Adapter/Internal/LoggingStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingStream.cs rename to src/Kestrel.Core/Adapter/Internal/LoggingStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs b/src/Kestrel.Core/Adapter/Internal/RawStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs rename to src/Kestrel.Core/Adapter/Internal/RawStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/ListenOptionsConnectionLoggingExtensions.cs b/src/Kestrel.Core/Adapter/ListenOptionsConnectionLoggingExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/ListenOptionsConnectionLoggingExtensions.cs rename to src/Kestrel.Core/Adapter/ListenOptionsConnectionLoggingExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/BadHttpRequestException.cs b/src/Kestrel.Core/BadHttpRequestException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/BadHttpRequestException.cs rename to src/Kestrel.Core/BadHttpRequestException.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/CoreStrings.resx b/src/Kestrel.Core/CoreStrings.resx similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/CoreStrings.resx rename to src/Kestrel.Core/CoreStrings.resx diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Features/IHttpMinRequestBodyDataRateFeature.cs b/src/Kestrel.Core/Features/IHttpMinRequestBodyDataRateFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Features/IHttpMinRequestBodyDataRateFeature.cs rename to src/Kestrel.Core/Features/IHttpMinRequestBodyDataRateFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Features/IHttpMinResponseDataRateFeature.cs b/src/Kestrel.Core/Features/IHttpMinResponseDataRateFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Features/IHttpMinResponseDataRateFeature.cs rename to src/Kestrel.Core/Features/IHttpMinResponseDataRateFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/AddressBinder.cs b/src/Kestrel.Core/Internal/AddressBinder.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/AddressBinder.cs rename to src/Kestrel.Core/Internal/AddressBinder.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs b/src/Kestrel.Core/Internal/ConnectionHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionHandler.cs rename to src/Kestrel.Core/Internal/ConnectionHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionLogScope.cs b/src/Kestrel.Core/Internal/ConnectionLogScope.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ConnectionLogScope.cs rename to src/Kestrel.Core/Internal/ConnectionLogScope.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/FrameConnection.cs b/src/Kestrel.Core/Internal/FrameConnection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/FrameConnection.cs rename to src/Kestrel.Core/Internal/FrameConnection.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/FrameConnectionContext.cs b/src/Kestrel.Core/Internal/FrameConnectionContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/FrameConnectionContext.cs rename to src/Kestrel.Core/Internal/FrameConnectionContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ChunkWriter.cs b/src/Kestrel.Core/Internal/Http/ChunkWriter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ChunkWriter.cs rename to src/Kestrel.Core/Internal/Http/ChunkWriter.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ConnectionOptions.cs b/src/Kestrel.Core/Internal/Http/ConnectionOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ConnectionOptions.cs rename to src/Kestrel.Core/Internal/Http/ConnectionOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/DateHeaderValueManager.cs b/src/Kestrel.Core/Internal/Http/DateHeaderValueManager.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/DateHeaderValueManager.cs rename to src/Kestrel.Core/Internal/Http/DateHeaderValueManager.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.FeatureCollection.cs b/src/Kestrel.Core/Internal/Http/Frame.FeatureCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.FeatureCollection.cs rename to src/Kestrel.Core/Internal/Http/Frame.FeatureCollection.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.Generated.cs b/src/Kestrel.Core/Internal/Http/Frame.Generated.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.Generated.cs rename to src/Kestrel.Core/Internal/Http/Frame.Generated.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs b/src/Kestrel.Core/Internal/Http/Frame.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.cs rename to src/Kestrel.Core/Internal/Http/Frame.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameAdapter.cs b/src/Kestrel.Core/Internal/Http/FrameAdapter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameAdapter.cs rename to src/Kestrel.Core/Internal/Http/FrameAdapter.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameContext.cs b/src/Kestrel.Core/Internal/Http/FrameContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameContext.cs rename to src/Kestrel.Core/Internal/Http/FrameContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameDuplexStream.cs b/src/Kestrel.Core/Internal/Http/FrameDuplexStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameDuplexStream.cs rename to src/Kestrel.Core/Internal/Http/FrameDuplexStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs b/src/Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs rename to src/Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameHeaders.cs b/src/Kestrel.Core/Internal/Http/FrameHeaders.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameHeaders.cs rename to src/Kestrel.Core/Internal/Http/FrameHeaders.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameOfT.cs b/src/Kestrel.Core/Internal/Http/FrameOfT.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameOfT.cs rename to src/Kestrel.Core/Internal/Http/FrameOfT.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestHeaders.cs b/src/Kestrel.Core/Internal/Http/FrameRequestHeaders.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestHeaders.cs rename to src/Kestrel.Core/Internal/Http/FrameRequestHeaders.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs b/src/Kestrel.Core/Internal/Http/FrameRequestStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs rename to src/Kestrel.Core/Internal/Http/FrameRequestStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseHeaders.cs b/src/Kestrel.Core/Internal/Http/FrameResponseHeaders.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseHeaders.cs rename to src/Kestrel.Core/Internal/Http/FrameResponseHeaders.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseStream.cs b/src/Kestrel.Core/Internal/Http/FrameResponseStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseStream.cs rename to src/Kestrel.Core/Internal/Http/FrameResponseStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameStreamState.cs b/src/Kestrel.Core/Internal/Http/FrameStreamState.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameStreamState.cs rename to src/Kestrel.Core/Internal/Http/FrameStreamState.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpMethod.cs b/src/Kestrel.Core/Internal/Http/HttpMethod.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpMethod.cs rename to src/Kestrel.Core/Internal/Http/HttpMethod.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpParser.cs b/src/Kestrel.Core/Internal/Http/HttpParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpParser.cs rename to src/Kestrel.Core/Internal/Http/HttpParser.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpScheme.cs b/src/Kestrel.Core/Internal/Http/HttpScheme.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpScheme.cs rename to src/Kestrel.Core/Internal/Http/HttpScheme.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpVersion.cs b/src/Kestrel.Core/Internal/Http/HttpVersion.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/HttpVersion.cs rename to src/Kestrel.Core/Internal/Http/HttpVersion.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IFrameControl.cs b/src/Kestrel.Core/Internal/Http/IFrameControl.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IFrameControl.cs rename to src/Kestrel.Core/Internal/Http/IFrameControl.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpHeadersHandler.cs b/src/Kestrel.Core/Internal/Http/IHttpHeadersHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpHeadersHandler.cs rename to src/Kestrel.Core/Internal/Http/IHttpHeadersHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpParser.cs b/src/Kestrel.Core/Internal/Http/IHttpParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpParser.cs rename to src/Kestrel.Core/Internal/Http/IHttpParser.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpRequestLineHandler.cs b/src/Kestrel.Core/Internal/Http/IHttpRequestLineHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/IHttpRequestLineHandler.cs rename to src/Kestrel.Core/Internal/Http/IHttpRequestLineHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/MessageBody.cs b/src/Kestrel.Core/Internal/Http/MessageBody.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/MessageBody.cs rename to src/Kestrel.Core/Internal/Http/MessageBody.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/OutputProducer.cs b/src/Kestrel.Core/Internal/Http/OutputProducer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/OutputProducer.cs rename to src/Kestrel.Core/Internal/Http/OutputProducer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/PathNormalizer.cs b/src/Kestrel.Core/Internal/Http/PathNormalizer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/PathNormalizer.cs rename to src/Kestrel.Core/Internal/Http/PathNormalizer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/PipelineExtensions.cs b/src/Kestrel.Core/Internal/Http/PipelineExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/PipelineExtensions.cs rename to src/Kestrel.Core/Internal/Http/PipelineExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ProduceEndType.cs b/src/Kestrel.Core/Internal/Http/ProduceEndType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ProduceEndType.cs rename to src/Kestrel.Core/Internal/Http/ProduceEndType.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ReasonPhrases.cs b/src/Kestrel.Core/Internal/Http/ReasonPhrases.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/ReasonPhrases.cs rename to src/Kestrel.Core/Internal/Http/ReasonPhrases.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/RequestProcessingStatus.cs b/src/Kestrel.Core/Internal/Http/RequestProcessingStatus.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/RequestProcessingStatus.cs rename to src/Kestrel.Core/Internal/Http/RequestProcessingStatus.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/RequestRejectionReason.cs b/src/Kestrel.Core/Internal/Http/RequestRejectionReason.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/RequestRejectionReason.cs rename to src/Kestrel.Core/Internal/Http/RequestRejectionReason.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/TransferCoding.cs b/src/Kestrel.Core/Internal/Http/TransferCoding.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/TransferCoding.cs rename to src/Kestrel.Core/Internal/Http/TransferCoding.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/CancellationTokenExtensions.cs b/src/Kestrel.Core/Internal/Infrastructure/CancellationTokenExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/CancellationTokenExtensions.cs rename to src/Kestrel.Core/Internal/Infrastructure/CancellationTokenExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Constants.cs b/src/Kestrel.Core/Internal/Infrastructure/Constants.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Constants.cs rename to src/Kestrel.Core/Internal/Infrastructure/Constants.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/CorrelationIdGenerator.cs b/src/Kestrel.Core/Internal/Infrastructure/CorrelationIdGenerator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/CorrelationIdGenerator.cs rename to src/Kestrel.Core/Internal/Infrastructure/CorrelationIdGenerator.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/DebuggerWrapper.cs b/src/Kestrel.Core/Internal/Infrastructure/DebuggerWrapper.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/DebuggerWrapper.cs rename to src/Kestrel.Core/Internal/Infrastructure/DebuggerWrapper.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Disposable.cs b/src/Kestrel.Core/Internal/Infrastructure/Disposable.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Disposable.cs rename to src/Kestrel.Core/Internal/Infrastructure/Disposable.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/DisposableAction.cs b/src/Kestrel.Core/Internal/Infrastructure/DisposableAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/DisposableAction.cs rename to src/Kestrel.Core/Internal/Infrastructure/DisposableAction.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameConnectionManager.cs b/src/Kestrel.Core/Internal/Infrastructure/FrameConnectionManager.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameConnectionManager.cs rename to src/Kestrel.Core/Internal/Infrastructure/FrameConnectionManager.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameConnectionManagerShutdownExtensions.cs b/src/Kestrel.Core/Internal/Infrastructure/FrameConnectionManagerShutdownExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameConnectionManagerShutdownExtensions.cs rename to src/Kestrel.Core/Internal/Infrastructure/FrameConnectionManagerShutdownExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameConnectionReference.cs b/src/Kestrel.Core/Internal/Infrastructure/FrameConnectionReference.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameConnectionReference.cs rename to src/Kestrel.Core/Internal/Infrastructure/FrameConnectionReference.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameHeartbeatManager.cs b/src/Kestrel.Core/Internal/Infrastructure/FrameHeartbeatManager.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/FrameHeartbeatManager.cs rename to src/Kestrel.Core/Internal/Infrastructure/FrameHeartbeatManager.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Heartbeat.cs b/src/Kestrel.Core/Internal/Infrastructure/Heartbeat.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Heartbeat.cs rename to src/Kestrel.Core/Internal/Infrastructure/Heartbeat.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/HttpUtilities.Generated.cs b/src/Kestrel.Core/Internal/Infrastructure/HttpUtilities.Generated.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/HttpUtilities.Generated.cs rename to src/Kestrel.Core/Internal/Infrastructure/HttpUtilities.Generated.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/HttpUtilities.cs b/src/Kestrel.Core/Internal/Infrastructure/HttpUtilities.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/HttpUtilities.cs rename to src/Kestrel.Core/Internal/Infrastructure/HttpUtilities.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IDebugger.cs b/src/Kestrel.Core/Internal/Infrastructure/IDebugger.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IDebugger.cs rename to src/Kestrel.Core/Internal/Infrastructure/IDebugger.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IHeartbeatHandler.cs b/src/Kestrel.Core/Internal/Infrastructure/IHeartbeatHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IHeartbeatHandler.cs rename to src/Kestrel.Core/Internal/Infrastructure/IHeartbeatHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IKestrelTrace.cs b/src/Kestrel.Core/Internal/Infrastructure/IKestrelTrace.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IKestrelTrace.cs rename to src/Kestrel.Core/Internal/Infrastructure/IKestrelTrace.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ISystemClock.cs b/src/Kestrel.Core/Internal/Infrastructure/ISystemClock.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ISystemClock.cs rename to src/Kestrel.Core/Internal/Infrastructure/ISystemClock.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IThreadPool.cs b/src/Kestrel.Core/Internal/Infrastructure/IThreadPool.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/IThreadPool.cs rename to src/Kestrel.Core/Internal/Infrastructure/IThreadPool.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ITimeoutControl.cs b/src/Kestrel.Core/Internal/Infrastructure/ITimeoutControl.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ITimeoutControl.cs rename to src/Kestrel.Core/Internal/Infrastructure/ITimeoutControl.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/InlineLoggingThreadPool.cs b/src/Kestrel.Core/Internal/Infrastructure/InlineLoggingThreadPool.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/InlineLoggingThreadPool.cs rename to src/Kestrel.Core/Internal/Infrastructure/InlineLoggingThreadPool.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/KestrelEventSource.cs b/src/Kestrel.Core/Internal/Infrastructure/KestrelEventSource.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/KestrelEventSource.cs rename to src/Kestrel.Core/Internal/Infrastructure/KestrelEventSource.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/KestrelTrace.cs b/src/Kestrel.Core/Internal/Infrastructure/KestrelTrace.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/KestrelTrace.cs rename to src/Kestrel.Core/Internal/Infrastructure/KestrelTrace.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/LoggingThreadPool.cs b/src/Kestrel.Core/Internal/Infrastructure/LoggingThreadPool.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/LoggingThreadPool.cs rename to src/Kestrel.Core/Internal/Infrastructure/LoggingThreadPool.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ReadOnlyStream.cs b/src/Kestrel.Core/Internal/Infrastructure/ReadOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ReadOnlyStream.cs rename to src/Kestrel.Core/Internal/Infrastructure/ReadOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ResourceCounter.cs b/src/Kestrel.Core/Internal/Infrastructure/ResourceCounter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ResourceCounter.cs rename to src/Kestrel.Core/Internal/Infrastructure/ResourceCounter.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Streams.cs b/src/Kestrel.Core/Internal/Infrastructure/Streams.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Streams.cs rename to src/Kestrel.Core/Internal/Infrastructure/Streams.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/StringUtilities.cs b/src/Kestrel.Core/Internal/Infrastructure/StringUtilities.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/StringUtilities.cs rename to src/Kestrel.Core/Internal/Infrastructure/StringUtilities.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/SystemClock.cs b/src/Kestrel.Core/Internal/Infrastructure/SystemClock.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/SystemClock.cs rename to src/Kestrel.Core/Internal/Infrastructure/SystemClock.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ThrowingWriteOnlyStream.cs b/src/Kestrel.Core/Internal/Infrastructure/ThrowingWriteOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/ThrowingWriteOnlyStream.cs rename to src/Kestrel.Core/Internal/Infrastructure/ThrowingWriteOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/TimeoutAction.cs b/src/Kestrel.Core/Internal/Infrastructure/TimeoutAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/TimeoutAction.cs rename to src/Kestrel.Core/Internal/Infrastructure/TimeoutAction.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/UriUtilities.cs b/src/Kestrel.Core/Internal/Infrastructure/UriUtilities.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/UriUtilities.cs rename to src/Kestrel.Core/Internal/Infrastructure/UriUtilities.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WrappingStream.cs b/src/Kestrel.Core/Internal/Infrastructure/WrappingStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WrappingStream.cs rename to src/Kestrel.Core/Internal/Infrastructure/WrappingStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WriteOnlyStream.cs b/src/Kestrel.Core/Internal/Infrastructure/WriteOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WriteOnlyStream.cs rename to src/Kestrel.Core/Internal/Infrastructure/WriteOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/KestrelServerOptionsSetup.cs b/src/Kestrel.Core/Internal/KestrelServerOptionsSetup.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/KestrelServerOptionsSetup.cs rename to src/Kestrel.Core/Internal/KestrelServerOptionsSetup.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/RejectionConnection.cs b/src/Kestrel.Core/Internal/RejectionConnection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/RejectionConnection.cs rename to src/Kestrel.Core/Internal/RejectionConnection.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ServerAddressesFeature.cs b/src/Kestrel.Core/Internal/ServerAddressesFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ServerAddressesFeature.cs rename to src/Kestrel.Core/Internal/ServerAddressesFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ServiceContext.cs b/src/Kestrel.Core/Internal/ServiceContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/ServiceContext.cs rename to src/Kestrel.Core/Internal/ServiceContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Kestrel.Core/Kestrel.Core.csproj similarity index 85% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj rename to src/Kestrel.Core/Kestrel.Core.csproj index d408125990..46181aa528 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Kestrel.Core/Kestrel.Core.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Core + Microsoft.AspNetCore.Server.Kestrel.Core Core components of ASP.NET Core Kestrel cross-platform web server. netstandard2.0 true @@ -24,7 +26,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServer.cs b/src/Kestrel.Core/KestrelServer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServer.cs rename to src/Kestrel.Core/KestrelServer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServerLimits.cs b/src/Kestrel.Core/KestrelServerLimits.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServerLimits.cs rename to src/Kestrel.Core/KestrelServerLimits.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServerOptions.cs b/src/Kestrel.Core/KestrelServerOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServerOptions.cs rename to src/Kestrel.Core/KestrelServerOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/ListenOptions.cs b/src/Kestrel.Core/ListenOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/ListenOptions.cs rename to src/Kestrel.Core/ListenOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/MinDataRate.cs b/src/Kestrel.Core/MinDataRate.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/MinDataRate.cs rename to src/Kestrel.Core/MinDataRate.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Properties/AssemblyInfo.cs b/src/Kestrel.Core/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Properties/AssemblyInfo.cs rename to src/Kestrel.Core/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Properties/CoreStrings.Designer.cs b/src/Kestrel.Core/Properties/CoreStrings.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Properties/CoreStrings.Designer.cs rename to src/Kestrel.Core/Properties/CoreStrings.Designer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/ServerAddress.cs b/src/Kestrel.Core/ServerAddress.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/ServerAddress.cs rename to src/Kestrel.Core/ServerAddress.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Systemd/KestrelServerOptionsSystemdExtensions.cs b/src/Kestrel.Core/Systemd/KestrelServerOptionsSystemdExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Core/Systemd/KestrelServerOptionsSystemdExtensions.cs rename to src/Kestrel.Core/Systemd/KestrelServerOptionsSystemdExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs b/src/Kestrel.Https/ClientCertificateMode.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/ClientCertificateMode.cs rename to src/Kestrel.Https/ClientCertificateMode.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionAdapterOptions.cs b/src/Kestrel.Https/HttpsConnectionAdapterOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionAdapterOptions.cs rename to src/Kestrel.Https/HttpsConnectionAdapterOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsStrings.resx b/src/Kestrel.Https/HttpsStrings.resx similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsStrings.resx rename to src/Kestrel.Https/HttpsStrings.resx diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/ClosedStream.cs b/src/Kestrel.Https/Internal/ClosedStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/ClosedStream.cs rename to src/Kestrel.Https/Internal/ClosedStream.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/HttpsConnectionAdapter.cs b/src/Kestrel.Https/Internal/HttpsConnectionAdapter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/HttpsConnectionAdapter.cs rename to src/Kestrel.Https/Internal/HttpsConnectionAdapter.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/TlsConnectionFeature.cs b/src/Kestrel.Https/Internal/TlsConnectionFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/Internal/TlsConnectionFeature.cs rename to src/Kestrel.Https/Internal/TlsConnectionFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj b/src/Kestrel.Https/Kestrel.Https.csproj similarity index 80% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj rename to src/Kestrel.Https/Kestrel.Https.csproj index d1801ffa01..ac3ae037a5 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj +++ b/src/Kestrel.Https/Kestrel.Https.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Https + Microsoft.AspNetCore.Server.Kestrel.Https HTTPS support for the ASP.NET Core Kestrel cross-platform web server. netstandard2.0 true @@ -14,7 +16,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/ListenOptionsHttpsExtensions.cs b/src/Kestrel.Https/ListenOptionsHttpsExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/ListenOptionsHttpsExtensions.cs rename to src/Kestrel.Https/ListenOptionsHttpsExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs b/src/Kestrel.Https/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/AssemblyInfo.cs rename to src/Kestrel.Https/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/HttpsStrings.Designer.cs b/src/Kestrel.Https/Properties/HttpsStrings.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Https/Properties/HttpsStrings.Designer.cs rename to src/Kestrel.Https/Properties/HttpsStrings.Designer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Exceptions/AddressInUseException.cs b/src/Kestrel.Transport.Abstractions/Exceptions/AddressInUseException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Exceptions/AddressInUseException.cs rename to src/Kestrel.Transport.Abstractions/Exceptions/AddressInUseException.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Exceptions/ConnectionAbortedException.cs b/src/Kestrel.Transport.Abstractions/Exceptions/ConnectionAbortedException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Exceptions/ConnectionAbortedException.cs rename to src/Kestrel.Transport.Abstractions/Exceptions/ConnectionAbortedException.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Exceptions/ConnectionResetException.cs b/src/Kestrel.Transport.Abstractions/Exceptions/ConnectionResetException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Exceptions/ConnectionResetException.cs rename to src/Kestrel.Transport.Abstractions/Exceptions/ConnectionResetException.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/FileHandleType.cs b/src/Kestrel.Transport.Abstractions/Internal/FileHandleType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/FileHandleType.cs rename to src/Kestrel.Transport.Abstractions/Internal/FileHandleType.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IConnectionContext.cs b/src/Kestrel.Transport.Abstractions/Internal/IConnectionContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IConnectionContext.cs rename to src/Kestrel.Transport.Abstractions/Internal/IConnectionContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IConnectionHandler.cs b/src/Kestrel.Transport.Abstractions/Internal/IConnectionHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IConnectionHandler.cs rename to src/Kestrel.Transport.Abstractions/Internal/IConnectionHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IConnectionInformation.cs b/src/Kestrel.Transport.Abstractions/Internal/IConnectionInformation.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IConnectionInformation.cs rename to src/Kestrel.Transport.Abstractions/Internal/IConnectionInformation.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IEndPointInformation.cs b/src/Kestrel.Transport.Abstractions/Internal/IEndPointInformation.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/IEndPointInformation.cs rename to src/Kestrel.Transport.Abstractions/Internal/IEndPointInformation.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/ITransport.cs b/src/Kestrel.Transport.Abstractions/Internal/ITransport.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/ITransport.cs rename to src/Kestrel.Transport.Abstractions/Internal/ITransport.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/ITransportFactory.cs b/src/Kestrel.Transport.Abstractions/Internal/ITransportFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/ITransportFactory.cs rename to src/Kestrel.Transport.Abstractions/Internal/ITransportFactory.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/ListenType.cs b/src/Kestrel.Transport.Abstractions/Internal/ListenType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/ListenType.cs rename to src/Kestrel.Transport.Abstractions/Internal/ListenType.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/SchedulingMode.cs b/src/Kestrel.Transport.Abstractions/Internal/SchedulingMode.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Internal/SchedulingMode.cs rename to src/Kestrel.Transport.Abstractions/Internal/SchedulingMode.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj similarity index 87% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj rename to src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj index b815a122bc..0051d3dabd 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj +++ b/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions + Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions Transport abstractions for the ASP.NET Core Kestrel cross-platform web server. netstandard2.0 true diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/IAsyncDisposable.cs b/src/Kestrel.Transport.Libuv/Internal/IAsyncDisposable.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/IAsyncDisposable.cs rename to src/Kestrel.Transport.Libuv/Internal/IAsyncDisposable.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ILibuvTrace.cs b/src/Kestrel.Transport.Libuv/Internal/ILibuvTrace.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ILibuvTrace.cs rename to src/Kestrel.Transport.Libuv/Internal/ILibuvTrace.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvAwaitable.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvAwaitable.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvAwaitable.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvAwaitable.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnection.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvConnection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnection.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvConnection.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvConnectionContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConstants.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvConstants.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvConstants.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvConstants.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvOutputConsumer.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvOutputConsumer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvOutputConsumer.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvOutputConsumer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvThread.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvThread.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvThread.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvThread.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvTrace.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvTrace.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvTrace.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvTrace.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvTransportContext.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvTransportContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/LibuvTransportContext.cs rename to src/Kestrel.Transport.Libuv/Internal/LibuvTransportContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Listener.cs b/src/Kestrel.Transport.Libuv/Internal/Listener.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Listener.cs rename to src/Kestrel.Transport.Libuv/Internal/Listener.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ListenerContext.cs b/src/Kestrel.Transport.Libuv/Internal/ListenerContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ListenerContext.cs rename to src/Kestrel.Transport.Libuv/Internal/ListenerContext.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ListenerPrimary.cs b/src/Kestrel.Transport.Libuv/Internal/ListenerPrimary.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ListenerPrimary.cs rename to src/Kestrel.Transport.Libuv/Internal/ListenerPrimary.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ListenerSecondary.cs b/src/Kestrel.Transport.Libuv/Internal/ListenerSecondary.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/ListenerSecondary.cs rename to src/Kestrel.Transport.Libuv/Internal/ListenerSecondary.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/LibuvFunctions.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/LibuvFunctions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/LibuvFunctions.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/LibuvFunctions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/PlatformApis.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/PlatformApis.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/PlatformApis.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/PlatformApis.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/SockAddr.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/SockAddr.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/SockAddr.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/SockAddr.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvAsyncHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvAsyncHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvAsyncHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvAsyncHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvConnectRequest.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvConnectRequest.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvConnectRequest.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvConnectRequest.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvException.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvException.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvException.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvLoopHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvLoopHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvLoopHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvLoopHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvMemory.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvMemory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvMemory.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvMemory.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvPipeHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvPipeHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvPipeHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvPipeHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvRequest.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvRequest.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvRequest.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvRequest.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvStreamHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvStreamHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvStreamHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvStreamHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvTcpHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvTcpHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvTcpHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvTcpHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvTimerHandle.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvTimerHandle.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvTimerHandle.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvTimerHandle.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvWriteReq.cs b/src/Kestrel.Transport.Libuv/Internal/Networking/UvWriteReq.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/Networking/UvWriteReq.cs rename to src/Kestrel.Transport.Libuv/Internal/Networking/UvWriteReq.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/WriteReqPool.cs b/src/Kestrel.Transport.Libuv/Internal/WriteReqPool.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Internal/WriteReqPool.cs rename to src/Kestrel.Transport.Libuv/Internal/WriteReqPool.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj similarity index 77% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj rename to src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj index 725988a030..78b2e79bc8 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj +++ b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv + Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv Libuv transport for the ASP.NET Core Kestrel cross-platform web server. netstandard2.0 true @@ -20,7 +22,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/LibuvTransport.cs b/src/Kestrel.Transport.Libuv/LibuvTransport.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/LibuvTransport.cs rename to src/Kestrel.Transport.Libuv/LibuvTransport.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/LibuvTransportFactory.cs b/src/Kestrel.Transport.Libuv/LibuvTransportFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/LibuvTransportFactory.cs rename to src/Kestrel.Transport.Libuv/LibuvTransportFactory.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/LibuvTransportOptions.cs b/src/Kestrel.Transport.Libuv/LibuvTransportOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/LibuvTransportOptions.cs rename to src/Kestrel.Transport.Libuv/LibuvTransportOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs b/src/Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs rename to src/Kestrel.Transport.Libuv/WebHostBuilderLibuvExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj similarity index 79% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj rename to src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj index eb63e0c381..f28cf1a9f3 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets + Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets Managed socket transport for the ASP.NET Core Kestrel cross-platform web server. netstandard2.0 true @@ -20,7 +22,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Properties/SocketsStrings.Designer.cs b/src/Kestrel.Transport.Sockets/Properties/SocketsStrings.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Properties/SocketsStrings.Designer.cs rename to src/Kestrel.Transport.Sockets/Properties/SocketsStrings.Designer.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketConnection.cs b/src/Kestrel.Transport.Sockets/SocketConnection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketConnection.cs rename to src/Kestrel.Transport.Sockets/SocketConnection.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketTransport.cs b/src/Kestrel.Transport.Sockets/SocketTransport.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketTransport.cs rename to src/Kestrel.Transport.Sockets/SocketTransport.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketTransportFactory.cs b/src/Kestrel.Transport.Sockets/SocketTransportFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketTransportFactory.cs rename to src/Kestrel.Transport.Sockets/SocketTransportFactory.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketTransportOptions.cs b/src/Kestrel.Transport.Sockets/SocketTransportOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketTransportOptions.cs rename to src/Kestrel.Transport.Sockets/SocketTransportOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketsStrings.resx b/src/Kestrel.Transport.Sockets/SocketsStrings.resx similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/SocketsStrings.resx rename to src/Kestrel.Transport.Sockets/SocketsStrings.resx diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/WebHostBuilderSocketExtensions.cs b/src/Kestrel.Transport.Sockets/WebHostBuilderSocketExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/WebHostBuilderSocketExtensions.cs rename to src/Kestrel.Transport.Sockets/WebHostBuilderSocketExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Kestrel/Kestrel.csproj similarity index 67% rename from src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj rename to src/Kestrel/Kestrel.csproj index eab9f18969..0afd53fb6d 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj +++ b/src/Kestrel/Kestrel.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel + Microsoft.AspNetCore.Server.Kestrel ASP.NET Core Kestrel cross-platform web server. netstandard2.0 true @@ -16,8 +18,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs b/src/Kestrel/WebHostBuilderKestrelExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs rename to src/Kestrel/WebHostBuilderKestrelExtensions.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/AddressBinderTests.cs b/test/Kestrel.Core.Tests/AddressBinderTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/AddressBinderTests.cs rename to test/Kestrel.Core.Tests/AddressBinderTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/AsciiDecoding.cs b/test/Kestrel.Core.Tests/AsciiDecoding.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/AsciiDecoding.cs rename to test/Kestrel.Core.Tests/AsciiDecoding.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ChunkWriterTests.cs b/test/Kestrel.Core.Tests/ChunkWriterTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ChunkWriterTests.cs rename to test/Kestrel.Core.Tests/ChunkWriterTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/DateHeaderValueManagerTests.cs b/test/Kestrel.Core.Tests/DateHeaderValueManagerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/DateHeaderValueManagerTests.cs rename to test/Kestrel.Core.Tests/DateHeaderValueManagerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameConnectionManagerTests.cs b/test/Kestrel.Core.Tests/FrameConnectionManagerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameConnectionManagerTests.cs rename to test/Kestrel.Core.Tests/FrameConnectionManagerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameConnectionTests.cs b/test/Kestrel.Core.Tests/FrameConnectionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameConnectionTests.cs rename to test/Kestrel.Core.Tests/FrameConnectionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameHeadersTests.cs b/test/Kestrel.Core.Tests/FrameHeadersTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameHeadersTests.cs rename to test/Kestrel.Core.Tests/FrameHeadersTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameRequestHeadersTests.cs b/test/Kestrel.Core.Tests/FrameRequestHeadersTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameRequestHeadersTests.cs rename to test/Kestrel.Core.Tests/FrameRequestHeadersTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameRequestStreamTests.cs b/test/Kestrel.Core.Tests/FrameRequestStreamTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameRequestStreamTests.cs rename to test/Kestrel.Core.Tests/FrameRequestStreamTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseHeadersTests.cs b/test/Kestrel.Core.Tests/FrameResponseHeadersTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseHeadersTests.cs rename to test/Kestrel.Core.Tests/FrameResponseHeadersTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseStreamTests.cs b/test/Kestrel.Core.Tests/FrameResponseStreamTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseStreamTests.cs rename to test/Kestrel.Core.Tests/FrameResponseStreamTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameTests.cs b/test/Kestrel.Core.Tests/FrameTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameTests.cs rename to test/Kestrel.Core.Tests/FrameTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HeartbeatTests.cs b/test/Kestrel.Core.Tests/HeartbeatTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HeartbeatTests.cs rename to test/Kestrel.Core.Tests/HeartbeatTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HttpParserTests.cs b/test/Kestrel.Core.Tests/HttpParserTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HttpParserTests.cs rename to test/Kestrel.Core.Tests/HttpParserTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HttpUtilitiesTest.cs b/test/Kestrel.Core.Tests/HttpUtilitiesTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HttpUtilitiesTest.cs rename to test/Kestrel.Core.Tests/HttpUtilitiesTest.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj similarity index 85% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj rename to test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj index 5289c063ab..469209bfd9 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Core.Tests + Microsoft.AspNetCore.Server.Kestrel.Core.Tests netcoreapp2.0;net461 netcoreapp2.0 true @@ -21,7 +23,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelEventSourceTests.cs b/test/Kestrel.Core.Tests/KestrelEventSourceTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelEventSourceTests.cs rename to test/Kestrel.Core.Tests/KestrelEventSourceTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerLimitsTests.cs b/test/Kestrel.Core.Tests/KestrelServerLimitsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerLimitsTests.cs rename to test/Kestrel.Core.Tests/KestrelServerLimitsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerOptionsTests.cs b/test/Kestrel.Core.Tests/KestrelServerOptionsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerOptionsTests.cs rename to test/Kestrel.Core.Tests/KestrelServerOptionsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerTests.cs b/test/Kestrel.Core.Tests/KestrelServerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KestrelServerTests.cs rename to test/Kestrel.Core.Tests/KestrelServerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KnownStringsTests.cs b/test/Kestrel.Core.Tests/KnownStringsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/KnownStringsTests.cs rename to test/Kestrel.Core.Tests/KnownStringsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MessageBodyTests.cs b/test/Kestrel.Core.Tests/MessageBodyTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MessageBodyTests.cs rename to test/Kestrel.Core.Tests/MessageBodyTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MinDataRateTests.cs b/test/Kestrel.Core.Tests/MinDataRateTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/MinDataRateTests.cs rename to test/Kestrel.Core.Tests/MinDataRateTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/OutputProducerTests.cs b/test/Kestrel.Core.Tests/OutputProducerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/OutputProducerTests.cs rename to test/Kestrel.Core.Tests/OutputProducerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/PathNormalizerTests.cs b/test/Kestrel.Core.Tests/PathNormalizerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/PathNormalizerTests.cs rename to test/Kestrel.Core.Tests/PathNormalizerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/PipeOptionsTests.cs b/test/Kestrel.Core.Tests/PipeOptionsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/PipeOptionsTests.cs rename to test/Kestrel.Core.Tests/PipeOptionsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/PipelineExtensionTests.cs b/test/Kestrel.Core.Tests/PipelineExtensionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/PipelineExtensionTests.cs rename to test/Kestrel.Core.Tests/PipelineExtensionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ResourceCounterTests.cs b/test/Kestrel.Core.Tests/ResourceCounterTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ResourceCounterTests.cs rename to test/Kestrel.Core.Tests/ResourceCounterTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ServerAddressTests.cs b/test/Kestrel.Core.Tests/ServerAddressTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ServerAddressTests.cs rename to test/Kestrel.Core.Tests/ServerAddressTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/StreamsTests.cs b/test/Kestrel.Core.Tests/StreamsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/StreamsTests.cs rename to test/Kestrel.Core.Tests/StreamsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/StringUtilitiesTests.cs b/test/Kestrel.Core.Tests/StringUtilitiesTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/StringUtilitiesTests.cs rename to test/Kestrel.Core.Tests/StringUtilitiesTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/AssertExtensions.cs b/test/Kestrel.Core.Tests/TestHelpers/AssertExtensions.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/AssertExtensions.cs rename to test/Kestrel.Core.Tests/TestHelpers/AssertExtensions.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs b/test/Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs rename to test/Kestrel.Core.Tests/TestHelpers/MockFrameControl.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestInput.cs b/test/Kestrel.Core.Tests/TestInput.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/TestInput.cs rename to test/Kestrel.Core.Tests/TestInput.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ThrowingWriteOnlyStreamTests.cs b/test/Kestrel.Core.Tests/ThrowingWriteOnlyStreamTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/ThrowingWriteOnlyStreamTests.cs rename to test/Kestrel.Core.Tests/ThrowingWriteOnlyStreamTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/xunit.runner.json b/test/Kestrel.Core.Tests/xunit.runner.json similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/xunit.runner.json rename to test/Kestrel.Core.Tests/xunit.runner.json diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs rename to test/Kestrel.FunctionalTests/AddressRegistrationTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/BadHttpRequestTests.cs b/test/Kestrel.FunctionalTests/BadHttpRequestTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/BadHttpRequestTests.cs rename to test/Kestrel.FunctionalTests/BadHttpRequestTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedRequestTests.cs b/test/Kestrel.FunctionalTests/ChunkedRequestTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedRequestTests.cs rename to test/Kestrel.FunctionalTests/ChunkedRequestTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedResponseTests.cs b/test/Kestrel.FunctionalTests/ChunkedResponseTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ChunkedResponseTests.cs rename to test/Kestrel.FunctionalTests/ChunkedResponseTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/ConnectionAdapterTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ConnectionAdapterTests.cs rename to test/Kestrel.FunctionalTests/ConnectionAdapterTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ConnectionLimitTests.cs b/test/Kestrel.FunctionalTests/ConnectionLimitTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ConnectionLimitTests.cs rename to test/Kestrel.FunctionalTests/ConnectionLimitTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/DefaultHeaderTests.cs b/test/Kestrel.FunctionalTests/DefaultHeaderTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/DefaultHeaderTests.cs rename to test/Kestrel.FunctionalTests/DefaultHeaderTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/EventSourceTests.cs b/test/Kestrel.FunctionalTests/EventSourceTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/EventSourceTests.cs rename to test/Kestrel.FunctionalTests/EventSourceTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/FrameConnectionManagerTests.cs b/test/Kestrel.FunctionalTests/FrameConnectionManagerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/FrameConnectionManagerTests.cs rename to test/Kestrel.FunctionalTests/FrameConnectionManagerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs b/test/Kestrel.FunctionalTests/GeneratedCodeTests.cs similarity index 88% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs rename to test/Kestrel.FunctionalTests/GeneratedCodeTests.cs index 99b8e9d88b..5a6b03781c 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs +++ b/test/Kestrel.FunctionalTests/GeneratedCodeTests.cs @@ -12,9 +12,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [Fact] public void GeneratedCodeIsUpToDate() { - const string frameHeadersGeneratedPath = "../../../../../src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs"; - const string frameGeneratedPath = "../../../../../src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/Frame.Generated.cs"; - const string httpUtilitiesGeneratedPath = "../../../../../src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/HttpUtilities.Generated.cs"; + const string frameHeadersGeneratedPath = "../../../../../src/Kestrel.Core/Internal/Http/FrameHeaders.Generated.cs"; + const string frameGeneratedPath = "../../../../../src/Kestrel.Core/Internal/Http/Frame.Generated.cs"; + const string httpUtilitiesGeneratedPath = "../../../../../src/Kestrel.Core/Internal/Infrastructure/HttpUtilities.Generated.cs"; var testFrameHeadersGeneratedPath = Path.GetTempFileName(); var testFrameGeneratedPath = Path.GetTempFileName(); diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs rename to test/Kestrel.FunctionalTests/HttpsConnectionAdapterTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs b/test/Kestrel.FunctionalTests/HttpsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/HttpsTests.cs rename to test/Kestrel.FunctionalTests/HttpsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs b/test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs rename to test/Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj b/test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj similarity index 86% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj rename to test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj index 9265ff3a69..d1e519263f 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj +++ b/test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.FunctionalTests + Microsoft.AspNetCore.Server.Kestrel.FunctionalTests netcoreapp2.0;net461 netcoreapp2.0 true @@ -25,8 +27,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ListenHandleTests.cs b/test/Kestrel.FunctionalTests/ListenHandleTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ListenHandleTests.cs rename to test/Kestrel.FunctionalTests/ListenHandleTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs b/test/Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs rename to test/Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs b/test/Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs rename to test/Kestrel.FunctionalTests/MaxRequestBodySizeTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs b/test/Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs rename to test/Kestrel.FunctionalTests/MaxRequestBufferSizeTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs b/test/Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs rename to test/Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs b/test/Kestrel.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs rename to test/Kestrel.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs b/test/Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs rename to test/Kestrel.FunctionalTests/RequestBodyTimeoutTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs b/test/Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs rename to test/Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs b/test/Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs rename to test/Kestrel.FunctionalTests/RequestHeadersTimeoutTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTargetProcessingTests.cs b/test/Kestrel.FunctionalTests/RequestTargetProcessingTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTargetProcessingTests.cs rename to test/Kestrel.FunctionalTests/RequestTargetProcessingTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs b/test/Kestrel.FunctionalTests/RequestTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestTests.cs rename to test/Kestrel.FunctionalTests/RequestTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs b/test/Kestrel.FunctionalTests/ResponseTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ResponseTests.cs rename to test/Kestrel.FunctionalTests/ResponseTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile b/test/Kestrel.FunctionalTests/SystemdActivation/Dockerfile similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile rename to test/Kestrel.FunctionalTests/SystemdActivation/Dockerfile diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker-entrypoint.sh b/test/Kestrel.FunctionalTests/SystemdActivation/docker-entrypoint.sh similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker-entrypoint.sh rename to test/Kestrel.FunctionalTests/SystemdActivation/docker-entrypoint.sh diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh b/test/Kestrel.FunctionalTests/SystemdActivation/docker.sh similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh rename to test/Kestrel.FunctionalTests/SystemdActivation/docker.sh diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/IPv6ScopeIdPresentConditionAttribute.cs b/test/Kestrel.FunctionalTests/TestHelpers/IPv6ScopeIdPresentConditionAttribute.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/IPv6ScopeIdPresentConditionAttribute.cs rename to test/Kestrel.FunctionalTests/TestHelpers/IPv6ScopeIdPresentConditionAttribute.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/IPv6SupportedConditionAttribute.cs b/test/Kestrel.FunctionalTests/TestHelpers/IPv6SupportedConditionAttribute.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/IPv6SupportedConditionAttribute.cs rename to test/Kestrel.FunctionalTests/TestHelpers/IPv6SupportedConditionAttribute.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/IWebHostPortExtensions.cs b/test/Kestrel.FunctionalTests/TestHelpers/IWebHostPortExtensions.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/IWebHostPortExtensions.cs rename to test/Kestrel.FunctionalTests/TestHelpers/IWebHostPortExtensions.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/NetworkIsReachableAttribute.cs b/test/Kestrel.FunctionalTests/TestHelpers/NetworkIsReachableAttribute.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/NetworkIsReachableAttribute.cs rename to test/Kestrel.FunctionalTests/TestHelpers/NetworkIsReachableAttribute.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/TestServer.cs b/test/Kestrel.FunctionalTests/TestHelpers/TestServer.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/TestHelpers/TestServer.cs rename to test/Kestrel.FunctionalTests/TestHelpers/TestServer.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs b/test/Kestrel.FunctionalTests/ThreadCountTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/ThreadCountTests.cs rename to test/Kestrel.FunctionalTests/ThreadCountTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/UpgradeTests.cs b/test/Kestrel.FunctionalTests/UpgradeTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/UpgradeTests.cs rename to test/Kestrel.FunctionalTests/UpgradeTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/xunit.runner.json b/test/Kestrel.FunctionalTests/xunit.runner.json similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/xunit.runner.json rename to test/Kestrel.FunctionalTests/xunit.runner.json diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/DotSegmentRemovalBenchmark.cs b/test/Kestrel.Performance/DotSegmentRemovalBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/DotSegmentRemovalBenchmark.cs rename to test/Kestrel.Performance/DotSegmentRemovalBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/ErrorUtilities.cs b/test/Kestrel.Performance/ErrorUtilities.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/ErrorUtilities.cs rename to test/Kestrel.Performance/ErrorUtilities.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/FrameFeatureCollection.cs b/test/Kestrel.Performance/FrameFeatureCollection.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/FrameFeatureCollection.cs rename to test/Kestrel.Performance/FrameFeatureCollection.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/FrameParsingOverheadBenchmark.cs b/test/Kestrel.Performance/FrameParsingOverheadBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/FrameParsingOverheadBenchmark.cs rename to test/Kestrel.Performance/FrameParsingOverheadBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/FrameWritingBenchmark.cs b/test/Kestrel.Performance/FrameWritingBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/FrameWritingBenchmark.cs rename to test/Kestrel.Performance/FrameWritingBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/test/Kestrel.Performance/Kestrel.Performance.csproj similarity index 77% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj rename to test/Kestrel.Performance/Kestrel.Performance.csproj index 281f7d50dc..2508e6c7f2 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/test/Kestrel.Performance/Kestrel.Performance.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Performance + Microsoft.AspNetCore.Server.Kestrel.Performance netcoreapp2.0;net461 netcoreapp2.0 Exe @@ -18,7 +20,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/KestrelHttpParserBenchmark.cs b/test/Kestrel.Performance/KestrelHttpParserBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/KestrelHttpParserBenchmark.cs rename to test/Kestrel.Performance/KestrelHttpParserBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/KnownStringsBenchmark.cs b/test/Kestrel.Performance/KnownStringsBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/KnownStringsBenchmark.cs rename to test/Kestrel.Performance/KnownStringsBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockConnectionInformation.cs b/test/Kestrel.Performance/Mocks/MockConnectionInformation.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockConnectionInformation.cs rename to test/Kestrel.Performance/Mocks/MockConnectionInformation.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockTimeoutControl.cs b/test/Kestrel.Performance/Mocks/MockTimeoutControl.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockTimeoutControl.cs rename to test/Kestrel.Performance/Mocks/MockTimeoutControl.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockTrace.cs b/test/Kestrel.Performance/Mocks/MockTrace.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/MockTrace.cs rename to test/Kestrel.Performance/Mocks/MockTrace.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/NullParser.cs b/test/Kestrel.Performance/Mocks/NullParser.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Mocks/NullParser.cs rename to test/Kestrel.Performance/Mocks/NullParser.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/PipeThroughputBenchmark.cs b/test/Kestrel.Performance/PipeThroughputBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/PipeThroughputBenchmark.cs rename to test/Kestrel.Performance/PipeThroughputBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs b/test/Kestrel.Performance/Program.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs rename to test/Kestrel.Performance/Program.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md b/test/Kestrel.Performance/Readme.md similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md rename to test/Kestrel.Performance/Readme.md diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsingBenchmark.cs b/test/Kestrel.Performance/RequestParsingBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsingBenchmark.cs rename to test/Kestrel.Performance/RequestParsingBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsingData.cs b/test/Kestrel.Performance/RequestParsingData.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsingData.cs rename to test/Kestrel.Performance/RequestParsingData.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs b/test/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs rename to test/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeadersWritingBenchmark.cs b/test/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeadersWritingBenchmark.cs rename to test/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/StringUtilitiesBenchmark.cs b/test/Kestrel.Performance/StringUtilitiesBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/StringUtilitiesBenchmark.cs rename to test/Kestrel.Performance/StringUtilitiesBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs b/test/Kestrel.Performance/configs/CoreConfig.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs rename to test/Kestrel.Performance/configs/CoreConfig.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Tests/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/test/Kestrel.Tests/Kestrel.Tests.csproj similarity index 76% rename from test/Microsoft.AspNetCore.Server.Kestrel.Tests/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj rename to test/Kestrel.Tests/Kestrel.Tests.csproj index dfe42a4b6c..b05d9659a9 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Tests/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/test/Kestrel.Tests/Kestrel.Tests.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Tests + Microsoft.AspNetCore.Server.Kestrel.Tests netcoreapp2.0;net461 netcoreapp2.0 @@ -12,7 +14,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs b/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs rename to test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Tests/xunit.runner.json b/test/Kestrel.Tests/xunit.runner.json similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Tests/xunit.runner.json rename to test/Kestrel.Tests/xunit.runner.json diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj b/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj similarity index 79% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj rename to test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj index a4fa5d8d2b..575504ff6f 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj +++ b/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj @@ -3,6 +3,8 @@ + Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests + Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests netcoreapp2.0;net461 netcoreapp2.0 true @@ -21,8 +23,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvConnectionTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvConnectionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvConnectionTests.cs rename to test/Kestrel.Transport.Libuv.Tests/LibuvConnectionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvOutputConsumerTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvOutputConsumerTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvOutputConsumerTests.cs rename to test/Kestrel.Transport.Libuv.Tests/LibuvOutputConsumerTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs rename to test/Kestrel.Transport.Libuv.Tests/LibuvTransportFactoryTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvTransportOptionsTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportOptionsTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvTransportOptionsTests.cs rename to test/Kestrel.Transport.Libuv.Tests/LibuvTransportOptionsTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs b/test/Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs rename to test/Kestrel.Transport.Libuv.Tests/LibuvTransportTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/ListenerPrimaryTests.cs b/test/Kestrel.Transport.Libuv.Tests/ListenerPrimaryTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/ListenerPrimaryTests.cs rename to test/Kestrel.Transport.Libuv.Tests/ListenerPrimaryTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/MultipleLoopTests.cs b/test/Kestrel.Transport.Libuv.Tests/MultipleLoopTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/MultipleLoopTests.cs rename to test/Kestrel.Transport.Libuv.Tests/MultipleLoopTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/NetworkingTests.cs b/test/Kestrel.Transport.Libuv.Tests/NetworkingTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/NetworkingTests.cs rename to test/Kestrel.Transport.Libuv.Tests/NetworkingTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/MockConnectionHandler.cs b/test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockConnectionHandler.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/MockConnectionHandler.cs rename to test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockConnectionHandler.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/MockLibuv.cs b/test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockLibuv.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/MockLibuv.cs rename to test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockLibuv.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/MockSocket.cs b/test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockSocket.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/MockSocket.cs rename to test/Kestrel.Transport.Libuv.Tests/TestHelpers/MockSocket.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/TestConstants.cs b/test/Kestrel.Transport.Libuv.Tests/TestHelpers/TestConstants.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/TestConstants.cs rename to test/Kestrel.Transport.Libuv.Tests/TestHelpers/TestConstants.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/TestLibuvTransportContext.cs b/test/Kestrel.Transport.Libuv.Tests/TestHelpers/TestLibuvTransportContext.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/TestHelpers/TestLibuvTransportContext.cs rename to test/Kestrel.Transport.Libuv.Tests/TestHelpers/TestLibuvTransportContext.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/UvStreamHandleTests.cs b/test/Kestrel.Transport.Libuv.Tests/UvStreamHandleTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/UvStreamHandleTests.cs rename to test/Kestrel.Transport.Libuv.Tests/UvStreamHandleTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/UvTimerHandleTests.cs b/test/Kestrel.Transport.Libuv.Tests/UvTimerHandleTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/UvTimerHandleTests.cs rename to test/Kestrel.Transport.Libuv.Tests/UvTimerHandleTests.cs diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/xunit.runner.json b/test/Kestrel.Transport.Libuv.Tests/xunit.runner.json similarity index 100% rename from test/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests/xunit.runner.json rename to test/Kestrel.Transport.Libuv.Tests/xunit.runner.json diff --git a/tools/CodeGenerator/CodeGenerator.csproj b/tools/CodeGenerator/CodeGenerator.csproj index 1569f84cbd..143a966654 100644 --- a/tools/CodeGenerator/CodeGenerator.csproj +++ b/tools/CodeGenerator/CodeGenerator.csproj @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - $(MSBuildThisFileDirectory)..\..\src\Microsoft.AspNetCore.Server.Kestrel.Core + $(MSBuildThisFileDirectory)..\..\src\Kestrel.Core Internal\Http\FrameHeaders.Generated.cs Internal\Http\Frame.Generated.cs Internal\Infrastructure\HttpUtilities.Generated.cs diff --git a/tools/CodeGenerator/FrameFeatureCollection.cs b/tools/CodeGenerator/FrameFeatureCollection.cs index 5fd8d0a8f5..d05139d919 100644 --- a/tools/CodeGenerator/FrameFeatureCollection.cs +++ b/tools/CodeGenerator/FrameFeatureCollection.cs @@ -60,7 +60,7 @@ namespace CodeGenerator 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.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs + // See also: src/Kestrel/Http/Frame.FeatureCollection.cs var implementedFeatures = new[] { typeof(IHttpRequestFeature),