diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index d45bd5a1f8..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,17 +0,0 @@ -init: -- git config --global core.autocrlf true -branches: - only: - - master - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -build_script: -- ps: .\run.ps1 default-build -clone_depth: 1 -environment: - global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: 'off' -deploy: 'off' -os: Visual Studio 2017 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 66abdf279e..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,51 +0,0 @@ -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -*.jpg binary -*.png binary -*.gif binary - -*.cs text=auto diff=csharp -*.vb text=auto -*.resx text=auto -*.c text=auto -*.cpp text=auto -*.cxx text=auto -*.h text=auto -*.hxx text=auto -*.py text=auto -*.rb text=auto -*.java text=auto -*.html text=auto -*.htm text=auto -*.css text=auto -*.scss text=auto -*.sass text=auto -*.less text=auto -*.js text=auto -*.lisp text=auto -*.clj text=auto -*.sql text=auto -*.php text=auto -*.lua text=auto -*.m text=auto -*.asm text=auto -*.erl text=auto -*.fs text=auto -*.fsx text=auto -*.hs text=auto - -*.csproj text=auto -*.vbproj text=auto -*.fsproj text=auto -*.dbproj text=auto -*.sln text=auto eol=crlf -*.sh eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c8dd6c52d5..0000000000 --- a/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -project.lock.json -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.vs/ -.build/ -.testPublish/ -.idea/ -.vscode/ -*.nuget.props -*.nuget.targets -global.json diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ab3980055c..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: csharp -sudo: false -dist: trusty -env: - global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -mono: none -os: -- linux -- osx -osx_image: xcode8.2 -addons: - apt: - packages: - - libunwind8 -branches: - only: - - master - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -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 diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml deleted file mode 100644 index c2c5336fd0..0000000000 --- a/.vsts-pipelines/builds/ci-internal.yml +++ /dev/null @@ -1,13 +0,0 @@ -trigger: -- master -- release/* - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/master - -phases: -- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml deleted file mode 100644 index 507c89b025..0000000000 --- a/.vsts-pipelines/builds/ci-public.yml +++ /dev/null @@ -1,15 +0,0 @@ -trigger: -- master -- release/* - -# See https://github.com/aspnet/BuildTools -resources: - repositories: - - repository: buildtools - type: github - endpoint: DotNet-Bot GitHub Connection - name: aspnet/BuildTools - ref: refs/heads/master - -phases: -- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/BasicMiddleware.sln b/BasicMiddleware.sln deleted file mode 100644 index 4bfc2ad2c5..0000000000 --- a/BasicMiddleware.sln +++ /dev/null @@ -1,194 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "src\Microsoft.AspNetCore.HttpOverrides\Microsoft.AspNetCore.HttpOverrides.csproj", "{517308C3-B477-4B01-B461-CAB9C10B6928}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5076D28-FA7E-4606-9410-FEDD0D603527}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8437B0F3-3894-4828-A945-A9187F37631D}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides.Tests", "test\Microsoft.AspNetCore.HttpOverrides.Tests\Microsoft.AspNetCore.HttpOverrides.Tests.csproj", "{D6341B92-3416-4F11-8DF4-CB274296175F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Buffering", "src\Microsoft.AspNetCore.Buffering\Microsoft.AspNetCore.Buffering.csproj", "{2363D0DD-A3BF-437E-9B64-B33AE132D875}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Buffering.Tests", "test\Microsoft.AspNetCore.Buffering.Tests\Microsoft.AspNetCore.Buffering.Tests.csproj", "{F5F1D123-9C81-4A9E-8644-AA46B8E578FB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9587FE9F-5A17-42C4-8021-E87F59CECB98}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseBufferingSample", "samples\ResponseBufferingSample\ResponseBufferingSample.csproj", "{E5C55B80-7827-40EB-B661-32B0E0E431CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpOverridesSample", "samples\HttpOverridesSample\HttpOverridesSample.csproj", "{7F95478D-E1D4-4A64-BA42-B041591A96EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "src\Microsoft.AspNetCore.Rewrite\Microsoft.AspNetCore.Rewrite.csproj", "{0E7CA1A7-1DC3-4CE6-B9C7-1688FE1410F1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RewriteSample", "samples\RewriteSample\RewriteSample.csproj", "{9E049645-13BC-4598-89E1-5B43D36E5D14}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite.Tests", "test\Microsoft.AspNetCore.Rewrite.Tests\Microsoft.AspNetCore.Rewrite.Tests.csproj", "{31794F9E-A1AA-4535-B03C-A3233737CD1A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression", "src\Microsoft.AspNetCore.ResponseCompression\Microsoft.AspNetCore.ResponseCompression.csproj", "{45308A9D-F4C6-46A8-A24F-E73D995CC223}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression.Tests", "test\Microsoft.AspNetCore.ResponseCompression.Tests\Microsoft.AspNetCore.ResponseCompression.Tests.csproj", "{3360A5D1-70C0-49EE-9051-04A6A6B836DC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseCompressionSample", "samples\ResponseCompressionSample\ResponseCompressionSample.csproj", "{B2A3CE38-51B2-4486-982C-98C380AF140E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{59A9B64C-E9BE-409E-89A2-58D72E2918F5}" - ProjectSection(SolutionItems) = preProject - .appveyor.yml = .appveyor.yml - .gitattributes = .gitattributes - .gitignore = .gitignore - .travis.yml = .travis.yml - build.cmd = build.cmd - build.ps1 = build.ps1 - build.sh = build.sh - CONTRIBUTING.md = CONTRIBUTING.md - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - LICENSE.txt = LICENSE.txt - NuGet.config = NuGet.config - NuGetPackageVerifier.json = NuGetPackageVerifier.json - README.md = README.md - version.xml = version.xml - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "src\Microsoft.AspNetCore.HttpsPolicy\Microsoft.AspNetCore.HttpsPolicy.csproj", "{4D39C29B-4EC8-497C-B411-922DA494D71B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpsPolicySample", "samples\HttpsPolicySample\HttpsPolicySample.csproj", "{AC424AEE-4883-49C6-945F-2FC916B8CA1C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy.Tests", "test\Microsoft.AspNetCore.HttpsPolicy.Tests\Microsoft.AspNetCore.HttpsPolicy.Tests.csproj", "{1C67B0F1-6E70-449E-A2F1-98B9D5C576CE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostFilteringSample", "samples\HostFilteringSample\HostFilteringSample.csproj", "{368B00A2-992A-4B0E-9085-A8136A22922D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5CEA6F31-A829-4A02-8CD5-EC3DDD4CC1EA}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\repo.props = build\repo.props - build\sources.props = build\sources.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HostFiltering.Tests", "test\Microsoft.AspNetCore.HostFiltering.Tests\Microsoft.AspNetCore.HostFiltering.Tests.csproj", "{4BC947ED-13B8-4BE6-82A4-96A48D86980B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HostFiltering", "src\Microsoft.AspNetCore.HostFiltering\Microsoft.AspNetCore.HostFiltering.csproj", "{762F7276-C916-4111-A6C0-41668ABB3823}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{C6DA6317-30FC-42FE-891C-64E75D88FF12}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ResponseCompression.Benchmarks", "benchmarks\Microsoft.AspNetCore.ResponseCompression.Benchmarks\Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj", "{5AF10E85-5076-40B9-84CF-9830B585ABE5}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {517308C3-B477-4B01-B461-CAB9C10B6928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {517308C3-B477-4B01-B461-CAB9C10B6928}.Debug|Any CPU.Build.0 = Debug|Any CPU - {517308C3-B477-4B01-B461-CAB9C10B6928}.Release|Any CPU.ActiveCfg = Release|Any CPU - {517308C3-B477-4B01-B461-CAB9C10B6928}.Release|Any CPU.Build.0 = Release|Any CPU - {D6341B92-3416-4F11-8DF4-CB274296175F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6341B92-3416-4F11-8DF4-CB274296175F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6341B92-3416-4F11-8DF4-CB274296175F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6341B92-3416-4F11-8DF4-CB274296175F}.Release|Any CPU.Build.0 = Release|Any CPU - {2363D0DD-A3BF-437E-9B64-B33AE132D875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2363D0DD-A3BF-437E-9B64-B33AE132D875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2363D0DD-A3BF-437E-9B64-B33AE132D875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2363D0DD-A3BF-437E-9B64-B33AE132D875}.Release|Any CPU.Build.0 = Release|Any CPU - {F5F1D123-9C81-4A9E-8644-AA46B8E578FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5F1D123-9C81-4A9E-8644-AA46B8E578FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5F1D123-9C81-4A9E-8644-AA46B8E578FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5F1D123-9C81-4A9E-8644-AA46B8E578FB}.Release|Any CPU.Build.0 = Release|Any CPU - {E5C55B80-7827-40EB-B661-32B0E0E431CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5C55B80-7827-40EB-B661-32B0E0E431CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5C55B80-7827-40EB-B661-32B0E0E431CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5C55B80-7827-40EB-B661-32B0E0E431CA}.Release|Any CPU.Build.0 = Release|Any CPU - {7F95478D-E1D4-4A64-BA42-B041591A96EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F95478D-E1D4-4A64-BA42-B041591A96EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F95478D-E1D4-4A64-BA42-B041591A96EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F95478D-E1D4-4A64-BA42-B041591A96EB}.Release|Any CPU.Build.0 = Release|Any CPU - {0E7CA1A7-1DC3-4CE6-B9C7-1688FE1410F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E7CA1A7-1DC3-4CE6-B9C7-1688FE1410F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E7CA1A7-1DC3-4CE6-B9C7-1688FE1410F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E7CA1A7-1DC3-4CE6-B9C7-1688FE1410F1}.Release|Any CPU.Build.0 = Release|Any CPU - {9E049645-13BC-4598-89E1-5B43D36E5D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E049645-13BC-4598-89E1-5B43D36E5D14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E049645-13BC-4598-89E1-5B43D36E5D14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E049645-13BC-4598-89E1-5B43D36E5D14}.Release|Any CPU.Build.0 = Release|Any CPU - {31794F9E-A1AA-4535-B03C-A3233737CD1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31794F9E-A1AA-4535-B03C-A3233737CD1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31794F9E-A1AA-4535-B03C-A3233737CD1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31794F9E-A1AA-4535-B03C-A3233737CD1A}.Release|Any CPU.Build.0 = Release|Any CPU - {45308A9D-F4C6-46A8-A24F-E73D995CC223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45308A9D-F4C6-46A8-A24F-E73D995CC223}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45308A9D-F4C6-46A8-A24F-E73D995CC223}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45308A9D-F4C6-46A8-A24F-E73D995CC223}.Release|Any CPU.Build.0 = Release|Any CPU - {3360A5D1-70C0-49EE-9051-04A6A6B836DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3360A5D1-70C0-49EE-9051-04A6A6B836DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3360A5D1-70C0-49EE-9051-04A6A6B836DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3360A5D1-70C0-49EE-9051-04A6A6B836DC}.Release|Any CPU.Build.0 = Release|Any CPU - {B2A3CE38-51B2-4486-982C-98C380AF140E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2A3CE38-51B2-4486-982C-98C380AF140E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2A3CE38-51B2-4486-982C-98C380AF140E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2A3CE38-51B2-4486-982C-98C380AF140E}.Release|Any CPU.Build.0 = Release|Any CPU - {4D39C29B-4EC8-497C-B411-922DA494D71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D39C29B-4EC8-497C-B411-922DA494D71B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D39C29B-4EC8-497C-B411-922DA494D71B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D39C29B-4EC8-497C-B411-922DA494D71B}.Release|Any CPU.Build.0 = Release|Any CPU - {AC424AEE-4883-49C6-945F-2FC916B8CA1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC424AEE-4883-49C6-945F-2FC916B8CA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC424AEE-4883-49C6-945F-2FC916B8CA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC424AEE-4883-49C6-945F-2FC916B8CA1C}.Release|Any CPU.Build.0 = Release|Any CPU - {1C67B0F1-6E70-449E-A2F1-98B9D5C576CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C67B0F1-6E70-449E-A2F1-98B9D5C576CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C67B0F1-6E70-449E-A2F1-98B9D5C576CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C67B0F1-6E70-449E-A2F1-98B9D5C576CE}.Release|Any CPU.Build.0 = Release|Any CPU - {368B00A2-992A-4B0E-9085-A8136A22922D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {368B00A2-992A-4B0E-9085-A8136A22922D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {368B00A2-992A-4B0E-9085-A8136A22922D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {368B00A2-992A-4B0E-9085-A8136A22922D}.Release|Any CPU.Build.0 = Release|Any CPU - {4BC947ED-13B8-4BE6-82A4-96A48D86980B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BC947ED-13B8-4BE6-82A4-96A48D86980B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BC947ED-13B8-4BE6-82A4-96A48D86980B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BC947ED-13B8-4BE6-82A4-96A48D86980B}.Release|Any CPU.Build.0 = Release|Any CPU - {762F7276-C916-4111-A6C0-41668ABB3823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {762F7276-C916-4111-A6C0-41668ABB3823}.Debug|Any CPU.Build.0 = Debug|Any CPU - {762F7276-C916-4111-A6C0-41668ABB3823}.Release|Any CPU.ActiveCfg = Release|Any CPU - {762F7276-C916-4111-A6C0-41668ABB3823}.Release|Any CPU.Build.0 = Release|Any CPU - {5AF10E85-5076-40B9-84CF-9830B585ABE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AF10E85-5076-40B9-84CF-9830B585ABE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AF10E85-5076-40B9-84CF-9830B585ABE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AF10E85-5076-40B9-84CF-9830B585ABE5}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {517308C3-B477-4B01-B461-CAB9C10B6928} = {A5076D28-FA7E-4606-9410-FEDD0D603527} - {D6341B92-3416-4F11-8DF4-CB274296175F} = {8437B0F3-3894-4828-A945-A9187F37631D} - {2363D0DD-A3BF-437E-9B64-B33AE132D875} = {A5076D28-FA7E-4606-9410-FEDD0D603527} - {F5F1D123-9C81-4A9E-8644-AA46B8E578FB} = {8437B0F3-3894-4828-A945-A9187F37631D} - {E5C55B80-7827-40EB-B661-32B0E0E431CA} = {9587FE9F-5A17-42C4-8021-E87F59CECB98} - {7F95478D-E1D4-4A64-BA42-B041591A96EB} = {9587FE9F-5A17-42C4-8021-E87F59CECB98} - {0E7CA1A7-1DC3-4CE6-B9C7-1688FE1410F1} = {A5076D28-FA7E-4606-9410-FEDD0D603527} - {9E049645-13BC-4598-89E1-5B43D36E5D14} = {9587FE9F-5A17-42C4-8021-E87F59CECB98} - {31794F9E-A1AA-4535-B03C-A3233737CD1A} = {8437B0F3-3894-4828-A945-A9187F37631D} - {45308A9D-F4C6-46A8-A24F-E73D995CC223} = {A5076D28-FA7E-4606-9410-FEDD0D603527} - {3360A5D1-70C0-49EE-9051-04A6A6B836DC} = {8437B0F3-3894-4828-A945-A9187F37631D} - {B2A3CE38-51B2-4486-982C-98C380AF140E} = {9587FE9F-5A17-42C4-8021-E87F59CECB98} - {4D39C29B-4EC8-497C-B411-922DA494D71B} = {A5076D28-FA7E-4606-9410-FEDD0D603527} - {AC424AEE-4883-49C6-945F-2FC916B8CA1C} = {9587FE9F-5A17-42C4-8021-E87F59CECB98} - {1C67B0F1-6E70-449E-A2F1-98B9D5C576CE} = {8437B0F3-3894-4828-A945-A9187F37631D} - {368B00A2-992A-4B0E-9085-A8136A22922D} = {9587FE9F-5A17-42C4-8021-E87F59CECB98} - {5CEA6F31-A829-4A02-8CD5-EC3DDD4CC1EA} = {59A9B64C-E9BE-409E-89A2-58D72E2918F5} - {4BC947ED-13B8-4BE6-82A4-96A48D86980B} = {8437B0F3-3894-4828-A945-A9187F37631D} - {762F7276-C916-4111-A6C0-41668ABB3823} = {A5076D28-FA7E-4606-9410-FEDD0D603527} - {5AF10E85-5076-40B9-84CF-9830B585ABE5} = {C6DA6317-30FC-42FE-891C-64E75D88FF12} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4518E9CE-3680-4E05-9259-B64EA7807158} - EndGlobalSection -EndGlobal diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index eac4268e4c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo. diff --git a/Directory.Build.props b/Directory.Build.props deleted file mode 100644 index cd2933d494..0000000000 --- a/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/BasicMiddleware - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - - - diff --git a/Directory.Build.targets b/Directory.Build.targets deleted file mode 100644 index 73b97f2807..0000000000 --- a/Directory.Build.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - - diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index b3b180cd51..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright (c) .NET Foundation and Contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index e32bddfd51..0000000000 --- a/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json deleted file mode 100644 index b153ab1515..0000000000 --- a/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 1ce333f1b4..0000000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -ASP.NET Core Basic Middleware Components -======== - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/02a73gv9gq02jw0j/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/basicmiddleware/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/BasicMiddleware.svg?branch=dev)](https://travis-ci.org/aspnet/BasicMiddleware) - -This repo hosts a collection of basic middleware components for ASP.NET Core. This includes Buffering, HTTP Overrides, Response Compression, and URL Rewriting. -The Rewrite middleware can import rules from IIS's UrlRewrite and Apache's mod_rewrite. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. diff --git a/benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj b/benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj deleted file mode 100644 index 5dbd63c35a..0000000000 --- a/benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - Exe - netcoreapp2.1 - - - - - - - - - - - - - - diff --git a/build.cmd b/build.cmd deleted file mode 100644 index c0050bda12..0000000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.sh b/build.sh deleted file mode 100755 index 98a4b22765..0000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "$DIR/run.sh"; sync -"$DIR/run.sh" default-build "$@" diff --git a/build/Key.snk b/build/Key.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/build/Key.snk and /dev/null differ diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 5b2e190af8..0000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,40 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 0.10.13 - 3.0.0-alpha1-20181011.3 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 2.1.3 - 2.2.0-preview2-26905-02 - 3.0.0-alpha1-10605 - 15.6.1 - 4.10.0 - 2.0.3 - 0.10.0 - 2.3.1 - 2.4.0 - - - - - diff --git a/build/repo.props b/build/repo.props deleted file mode 100644 index 62bcfa994f..0000000000 --- a/build/repo.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Internal.AspNetCore.Universe.Lineup - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - - - - diff --git a/build/sources.props b/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/korebuild-lock.txt b/korebuild-lock.txt deleted file mode 100644 index f7d4e37b32..0000000000 --- a/korebuild-lock.txt +++ /dev/null @@ -1,2 +0,0 @@ -version:3.0.0-alpha1-20181011.3 -commithash:e7569d931e994629267ab2646e9926140962b4ac diff --git a/korebuild.json b/korebuild.json deleted file mode 100644 index 8a276a7f35..0000000000 --- a/korebuild.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master" -} diff --git a/run.cmd b/run.cmd deleted file mode 100644 index d52d5c7e68..0000000000 --- a/run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 34604c7175..0000000000 --- a/run.ps1 +++ /dev/null @@ -1,209 +0,0 @@ -#!/usr/bin/env powershell -#requires -version 4 - -<# -.SYNOPSIS -Executes KoreBuild commands. - -.DESCRIPTION -Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. - -.PARAMETER Command -The KoreBuild command to run. - -.PARAMETER Path -The folder to build. Defaults to the folder containing this script. - -.PARAMETER Channel -The channel of KoreBuild to download. Overrides the value from the config file. - -.PARAMETER DotNetHome -The directory where .NET Core tools will be stored. - -.PARAMETER ToolsSource -The base url where build tools can be downloaded. Overrides the value from the config file. - -.PARAMETER Update -Updates KoreBuild to the latest version even if a lock file is present. - -.PARAMETER Reinstall -Re-installs KoreBuild - -.PARAMETER ConfigFile -The path to the configuration file that stores values. Defaults to korebuild.json. - -.PARAMETER ToolsSourceSuffix -The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. - -.PARAMETER CI -Sets up CI specific settings and variables. - -.PARAMETER Arguments -Arguments to be passed to the command - -.NOTES -This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. -When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. - -The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set -in the file are overridden by command line parameters. - -.EXAMPLE -Example config file: -```json -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", - "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" -} -``` -#> -[CmdletBinding(PositionalBinding = $false)] -param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$Command, - [string]$Path = $PSScriptRoot, - [Alias('c')] - [string]$Channel, - [Alias('d')] - [string]$DotNetHome, - [Alias('s')] - [string]$ToolsSource, - [Alias('u')] - [switch]$Update, - [switch]$Reinstall, - [string]$ToolsSourceSuffix, - [string]$ConfigFile = $null, - [switch]$CI, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$Arguments -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -# -# Functions -# - -function Get-KoreBuild { - - $lockFile = Join-Path $Path 'korebuild-lock.txt' - - if (!(Test-Path $lockFile) -or $Update) { - Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix - } - - $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 - if (!$version) { - Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" - } - $version = $version.TrimStart('version:').Trim() - $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) - - if ($Reinstall -and (Test-Path $korebuildPath)) { - Remove-Item -Force -Recurse $korebuildPath - } - - if (!(Test-Path $korebuildPath)) { - Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" - New-Item -ItemType Directory -Path $korebuildPath | Out-Null - $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" - - try { - $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" - Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { - # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath - } - else { - # Fallback to old approach for old installations of PowerShell - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) - } - } - catch { - Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore - throw - } - finally { - Remove-Item $tmpfile -ErrorAction Ignore - } - } - - return $korebuildPath -} - -function Join-Paths([string]$path, [string[]]$childPaths) { - $childPaths | ForEach-Object { $path = Join-Path $path $_ } - return $path -} - -function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { - if ($RemotePath -notlike 'http*') { - Copy-Item $RemotePath $LocalPath - return - } - - $retries = 10 - while ($retries -gt 0) { - $retries -= 1 - try { - Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath - return - } - catch { - Write-Verbose "Request failed. $retries retries remaining" - } - } - - Write-Error "Download failed: '$RemotePath'." -} - -# -# Main -# - -# Load configuration or set defaults - -$Path = Resolve-Path $Path -if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } - -if (Test-Path $ConfigFile) { - try { - $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json - if ($config) { - if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } - if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} - } - } - catch { - Write-Host -ForegroundColor Red $Error[0] - Write-Error "$ConfigFile contains invalid JSON." - exit 1 - } -} - -if (!$DotNetHome) { - $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` - elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` - elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` - else { Join-Path $PSScriptRoot '.dotnet'} -} - -if (!$Channel) { $Channel = 'master' } -if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - -# Execute - -$korebuildPath = Get-KoreBuild -Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - -try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI - Invoke-KoreBuildCommand $Command @Arguments -} -finally { - Remove-Module 'KoreBuild' -ErrorAction Ignore -} diff --git a/run.sh b/run.sh deleted file mode 100755 index 4c1fed5646..0000000000 --- a/run.sh +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# -# variables -# - -RESET="\033[0m" -RED="\033[0;31m" -YELLOW="\033[0;33m" -MAGENTA="\033[0;95m" -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" -verbose=false -update=false -reinstall=false -repo_path="$DIR" -channel='' -tools_source='' -tools_source_suffix='' -ci=false - -# -# Functions -# -__usage() { - echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" - echo "" - echo "Arguments:" - echo " command The command to be run." - echo " ... Arguments passed to the command. Variable number of arguments allowed." - echo "" - echo "Options:" - echo " --verbose Show verbose output." - echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." - echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." - echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." - echo " --path The directory to build. Defaults to the directory containing the script." - echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." - echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." - echo " -u|--update Update to the latest KoreBuild even if the lock file is present." - echo " --reinstall Reinstall KoreBuild." - echo " --ci Apply CI specific settings and environment variables." - echo "" - echo "Description:" - echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." - echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - - if [[ "${1:-}" != '--no-exit' ]]; then - exit 2 - fi -} - -get_korebuild() { - local version - local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f "$lock_file" ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" - fi - version="$(grep 'version:*' -m 1 "$lock_file")" - if [[ "$version" == '' ]]; then - __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" - return 1 - fi - version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - - if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then - rm -rf "$korebuild_path" - fi - - { - if [ ! -d "$korebuild_path" ]; then - mkdir -p "$korebuild_path" - local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" - tmpfile="$(mktemp)" - echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then - unzip -q -d "$korebuild_path" "$tmpfile" - fi - rm "$tmpfile" || true - fi - - source "$korebuild_path/KoreBuild.sh" - } || { - if [ -d "$korebuild_path" ]; then - echo "Cleaning up after failed installation" - rm -rf "$korebuild_path" || true - fi - return 1 - } -} - -__error() { - echo -e "${RED}error: $*${RESET}" 1>&2 -} - -__warn() { - echo -e "${YELLOW}warning: $*${RESET}" -} - -__machine_has() { - hash "$1" > /dev/null 2>&1 - return $? -} - -__get_remote_file() { - local remote_path=$1 - local local_path=$2 - local remote_path_suffix=$3 - - if [[ "$remote_path" != 'http'* ]]; then - cp "$remote_path" "$local_path" - return 0 - fi - - local failed=false - if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - else - failed=true - fi - - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - fi - - if [ "$failed" = true ]; then - __error "Download failed: $remote_path" 1>&2 - return 1 - fi -} - -# -# main -# - -command="${1:-}" -shift - -while [[ $# -gt 0 ]]; do - case $1 in - -\?|-h|--help) - __usage --no-exit - exit 0 - ;; - -c|--channel|-Channel) - shift - channel="${1:-}" - [ -z "$channel" ] && __usage - ;; - --config-file|-ConfigFile) - shift - config_file="${1:-}" - [ -z "$config_file" ] && __usage - if [ ! -f "$config_file" ]; then - __error "Invalid value for --config-file. $config_file does not exist." - exit 1 - fi - ;; - -d|--dotnet-home|-DotNetHome) - shift - DOTNET_HOME="${1:-}" - [ -z "$DOTNET_HOME" ] && __usage - ;; - --path|-Path) - shift - repo_path="${1:-}" - [ -z "$repo_path" ] && __usage - ;; - -s|--tools-source|-ToolsSource) - shift - tools_source="${1:-}" - [ -z "$tools_source" ] && __usage - ;; - --tools-source-suffix|-ToolsSourceSuffix) - shift - tools_source_suffix="${1:-}" - [ -z "$tools_source_suffix" ] && __usage - ;; - -u|--update|-Update) - update=true - ;; - --reinstall|-[Rr]einstall) - reinstall=true - ;; - --ci|-[Cc][Ii]) - ci=true - ;; - --verbose|-Verbose) - verbose=true - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -if ! __machine_has unzip; then - __error 'Missing required command: unzip' - exit 1 -fi - -if ! __machine_has curl && ! __machine_has wget; then - __error 'Missing required command. Either wget or curl is required.' - exit 1 -fi - -[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" -if [ -f "$config_file" ]; then - if __machine_has jq ; then - if jq '.' "$config_file" >/dev/null ; then - config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" - config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python ; then - if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python3 ; then - if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - else - __error 'Missing required command: jq or python. Could not parse the JSON file.' - exit 1 - fi - - [ ! -z "${config_channel:-}" ] && channel="$config_channel" - [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" -fi - -[ -z "$channel" ] && channel='master' -[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' - -get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" -invoke_korebuild_command "$command" "$@" diff --git a/samples/HostFilteringSample/HostFilteringSample.csproj b/samples/HostFilteringSample/HostFilteringSample.csproj deleted file mode 100644 index 92f6fbc290..0000000000 --- a/samples/HostFilteringSample/HostFilteringSample.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - netcoreapp2.2;net461 - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj deleted file mode 100644 index 49ca42e718..0000000000 --- a/samples/HttpOverridesSample/HttpOverridesSample.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.2;net461 - - - - - - - - - - - diff --git a/samples/HttpsPolicySample/HttpsPolicySample.csproj b/samples/HttpsPolicySample/HttpsPolicySample.csproj deleted file mode 100644 index 38ca805a0b..0000000000 --- a/samples/HttpsPolicySample/HttpsPolicySample.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net461;netcoreapp2.2 - netcoreapp2.2 - - - - - - - - - - - - - diff --git a/samples/ResponseBufferingSample/Properties/launchSettings.json b/samples/ResponseBufferingSample/Properties/launchSettings.json deleted file mode 100644 index 2555984271..0000000000 --- a/samples/ResponseBufferingSample/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:49657/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNET_ENV": "Development" - } - }, - "web": { - "commandName": "web", - "environmentVariables": { - "Hosting:Environment": "Development" - } - } - } -} \ No newline at end of file diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj deleted file mode 100644 index f988e035a8..0000000000 --- a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.2;net461 - - - - - - - - - - - diff --git a/samples/ResponseBufferingSample/Startup.cs b/samples/ResponseBufferingSample/Startup.cs deleted file mode 100644 index c2189ad1ee..0000000000 --- a/samples/ResponseBufferingSample/Startup.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; - -namespace ResponseBufferingSample -{ - public class Startup - { - // For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - } - - public void Configure(IApplicationBuilder app) - { - app.UseResponseBuffering(); - app.Run(async (context) => - { - // Write some stuff - context.Response.ContentType = "text/other"; - await context.Response.WriteAsync("Hello World!"); - - // ... more work ... - - // Something went wrong and we want to replace the response - context.Response.StatusCode = 200; - context.Response.Headers.Clear(); - context.Response.Body.SetLength(0); - - // Try again - context.Response.ContentType = "text/plain"; - await context.Response.WriteAsync("Hi Bob!"); - }); - } - - // Entry point for the application. - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseKestrel() - // .UseIIS() // This repo can no longer reference IIS because IISIntegration depends on it. - .UseStartup() - .Build(); - - host.Run(); - } - } -} - diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj deleted file mode 100644 index d6ac370925..0000000000 --- a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.2;net461 - - - - - - - - - - - - - - - - diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj deleted file mode 100644 index f76f114da3..0000000000 --- a/samples/RewriteSample/RewriteSample.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.2;net461 - - - - - - - - - - - - diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs deleted file mode 100644 index db3aacf5dd..0000000000 --- a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs +++ /dev/null @@ -1,218 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.Buffering -{ - internal class BufferingWriteStream : Stream - { - private readonly Stream _innerStream; - private readonly MemoryStream _buffer = new MemoryStream(); - private bool _isBuffering = true; - - public BufferingWriteStream(Stream innerStream) - { - _innerStream = innerStream; - } - - public override bool CanRead - { - get { return false; } - } - - public override bool CanSeek - { - get { return _isBuffering; } - } - - public override bool CanWrite - { - get { return _innerStream.CanWrite; } - } - - public override long Length - { - get - { - if (_isBuffering) - { - return _buffer.Length; - } - // May throw - return _innerStream.Length; - } - } - - // Clear/Reset the buffer by setting Position, Seek, or SetLength to 0. Random access is not supported. - public override long Position - { - get - { - if (_isBuffering) - { - return _buffer.Position; - } - // May throw - return _innerStream.Position; - } - set - { - if (_isBuffering) - { - if (value != 0) - { - throw new ArgumentOutOfRangeException(nameof(value), value, nameof(Position) + " can only be set to 0."); - } - _buffer.Position = value; - _buffer.SetLength(value); - } - else - { - // May throw - _innerStream.Position = value; - } - } - } - - // Clear/Reset the buffer by setting Position, Seek, or SetLength to 0. Random access is not supported. - public override void SetLength(long value) - { - if (_isBuffering) - { - if (value != 0) - { - throw new ArgumentOutOfRangeException(nameof(value), value, nameof(Length) + " can only be set to 0."); - } - _buffer.Position = value; - _buffer.SetLength(value); - } - else - { - // May throw - _innerStream.SetLength(value); - } - } - - // Clear/Reset the buffer by setting Position, Seek, or SetLength to 0. Random access is not supported. - public override long Seek(long offset, SeekOrigin origin) - { - if (_isBuffering) - { - if (origin != SeekOrigin.Begin) - { - throw new ArgumentException(nameof(origin), nameof(Seek) + " can only be set to " + nameof(SeekOrigin.Begin) + "."); - } - if (offset != 0) - { - throw new ArgumentOutOfRangeException(nameof(offset), offset, nameof(Seek) + " can only be set to 0."); - } - _buffer.SetLength(offset); - return _buffer.Seek(offset, origin); - } - // Try the inner stream instead, but this will usually fail. - return _innerStream.Seek(offset, origin); - } - - internal void DisableBuffering() - { - _isBuffering = false; - if (_buffer.Length > 0) - { - Flush(); - } - } - - internal Task DisableBufferingAsync(CancellationToken cancellationToken) - { - _isBuffering = false; - if (_buffer.Length > 0) - { - return FlushAsync(cancellationToken); - } - return Task.CompletedTask; - } - - public override void Write(byte[] buffer, int offset, int count) - { - if (_isBuffering) - { - _buffer.Write(buffer, offset, count); - } - else - { - _innerStream.Write(buffer, offset, count); - } - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - if (_isBuffering) - { - return _buffer.WriteAsync(buffer, offset, count, cancellationToken); - } - else - { - return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); - } - } - - public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) - { - if (_isBuffering) - { - return _buffer.BeginWrite(buffer, offset, count, callback, state); - } - else - { - return _innerStream.BeginWrite(buffer, offset, count, callback, state); - } - } - - public override void EndWrite(IAsyncResult asyncResult) - { - if (_isBuffering) - { - _buffer.EndWrite(asyncResult); - } - else - { - _innerStream.EndWrite(asyncResult); - } - } - - public override void Flush() - { - _isBuffering = false; - if (_buffer.Length > 0) - { - _buffer.Seek(0, SeekOrigin.Begin); - _buffer.CopyTo(_innerStream); - _buffer.Seek(0, SeekOrigin.Begin); - _buffer.SetLength(0); - } - _innerStream.Flush(); - } - - public override async Task FlushAsync(CancellationToken cancellationToken) - { - _isBuffering = false; - if (_buffer.Length > 0) - { - _buffer.Seek(0, SeekOrigin.Begin); - await _buffer.CopyToAsync(_innerStream, 1024 * 16, cancellationToken); - _buffer.Seek(0, SeekOrigin.Begin); - _buffer.SetLength(0); - } - await _innerStream.FlushAsync(cancellationToken); - } - - public override int Read(byte[] buffer, int offset, int count) - { - throw new NotSupportedException("This Stream only supports Write operations."); - } - } -} diff --git a/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs b/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs deleted file mode 100644 index 746712f5c8..0000000000 --- a/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Http.Features; - -namespace Microsoft.AspNetCore.Buffering -{ - internal class HttpBufferingFeature : IHttpBufferingFeature - { - private readonly BufferingWriteStream _buffer; - private readonly IHttpBufferingFeature _innerFeature; - - internal HttpBufferingFeature(BufferingWriteStream buffer, IHttpBufferingFeature innerFeature) - { - _buffer = buffer; - _innerFeature = innerFeature; - } - - public void DisableRequestBuffering() - { - _innerFeature?.DisableRequestBuffering(); - } - - public void DisableResponseBuffering() - { - _buffer.DisableBuffering(); - _innerFeature?.DisableResponseBuffering(); - } - } -} diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj deleted file mode 100644 index 953716c6c1..0000000000 --- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) - false - $(ExperimentalPackageVersion) - ASP.NET Core middleware for buffering response bodies. - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;buffer;buffering - - - - - - - diff --git a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs deleted file mode 100644 index bd5b8e1515..0000000000 --- a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; - -namespace Microsoft.AspNetCore.Buffering -{ - public class ResponseBufferingMiddleware - { - private readonly RequestDelegate _next; - - public ResponseBufferingMiddleware(RequestDelegate next) - { - _next = next; - } - - public async Task Invoke(HttpContext httpContext) - { - var originalResponseBody = httpContext.Response.Body; - - // no-op if buffering is already available. - if (originalResponseBody.CanSeek) - { - await _next(httpContext); - return; - } - - var originalBufferingFeature = httpContext.Features.Get(); - var originalSendFileFeature = httpContext.Features.Get(); - try - { - // Shim the response stream - var bufferStream = new BufferingWriteStream(originalResponseBody); - httpContext.Response.Body = bufferStream; - httpContext.Features.Set(new HttpBufferingFeature(bufferStream, originalBufferingFeature)); - if (originalSendFileFeature != null) - { - httpContext.Features.Set(new SendFileFeatureWrapper(originalSendFileFeature, bufferStream)); - } - - await _next(httpContext); - - // If we're still buffered, set the content-length header and flush the buffer. - // Only if the content-length header is not already set, and some content was buffered. - if (!httpContext.Response.HasStarted && bufferStream.CanSeek && bufferStream.Length > 0) - { - if (!httpContext.Response.ContentLength.HasValue) - { - httpContext.Response.ContentLength = bufferStream.Length; - } - await bufferStream.FlushAsync(); - } - } - finally - { - // undo everything - httpContext.Features.Set(originalBufferingFeature); - httpContext.Features.Set(originalSendFileFeature); - httpContext.Response.Body = originalResponseBody; - } - } - } -} diff --git a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs deleted file mode 100644 index 5092dba3c4..0000000000 --- a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Buffering; - -namespace Microsoft.AspNetCore.Builder -{ - public static class ResponseBufferingMiddlewareExtensions - { - /// - /// Enables full buffering of response bodies. This can be disabled on a per request basis using IHttpBufferingFeature. - /// - /// - /// - public static IApplicationBuilder UseResponseBuffering(this IApplicationBuilder builder) - { - return builder.UseMiddleware(); - } - } -} diff --git a/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs b/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs deleted file mode 100644 index 346173e315..0000000000 --- a/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Features; - -namespace Microsoft.AspNetCore.Buffering -{ - internal class SendFileFeatureWrapper : IHttpSendFileFeature - { - private readonly IHttpSendFileFeature _originalSendFileFeature; - private readonly BufferingWriteStream _bufferStream; - - public SendFileFeatureWrapper(IHttpSendFileFeature originalSendFileFeature, BufferingWriteStream bufferStream) - { - _originalSendFileFeature = originalSendFileFeature; - _bufferStream = bufferStream; - } - - // Flush and disable the buffer if anyone tries to call the SendFile feature. - public async Task SendFileAsync(string path, long offset, long? length, CancellationToken cancellation) - { - await _bufferStream.DisableBufferingAsync(cancellation); - await _originalSendFileFeature.SendFileAsync(path, offset, length, cancellation); - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.HostFiltering/Microsoft.AspNetCore.HostFiltering.csproj b/src/Microsoft.AspNetCore.HostFiltering/Microsoft.AspNetCore.HostFiltering.csproj deleted file mode 100644 index ec6d642340..0000000000 --- a/src/Microsoft.AspNetCore.HostFiltering/Microsoft.AspNetCore.HostFiltering.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - ASP.NET Core middleware for filtering out requests with unknown HTTP host headers. - - netstandard2.0 - true - aspnetcore - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Microsoft.AspNetCore.HttpsPolicy/Microsoft.AspNetCore.HttpsPolicy.csproj deleted file mode 100644 index ee7e611a47..0000000000 --- a/src/Microsoft.AspNetCore.HttpsPolicy/Microsoft.AspNetCore.HttpsPolicy.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - ASP.NET Core basic middleware for supporting HTTPS Redirection and HTTP Strict-Transport-Security. - - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;https;hsts - - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj deleted file mode 100644 index 7f594f1c30..0000000000 --- a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - ASP.NET Core middleware for HTTP Response compression. - net461;netstandard2.0;netcoreapp2.1 - true - aspnetcore - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj deleted file mode 100644 index 03c3e53b64..0000000000 --- a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - ASP.NET Core basic middleware for rewriting URLs. Includes: -* Support for custom URL rewrite rules -* Support for running IIS URL Rewrite module rules -* Support for running Apache mod_rewrite rules. - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;urlrewrite;mod_rewrite - - - - - - - - - - - - diff --git a/src/Middleware/HostFiltering/sample/HostFilteringSample.csproj b/src/Middleware/HostFiltering/sample/HostFilteringSample.csproj new file mode 100644 index 0000000000..a3af4c632a --- /dev/null +++ b/src/Middleware/HostFiltering/sample/HostFilteringSample.csproj @@ -0,0 +1,26 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + diff --git a/samples/HostFilteringSample/Program.cs b/src/Middleware/HostFiltering/sample/Program.cs similarity index 100% rename from samples/HostFilteringSample/Program.cs rename to src/Middleware/HostFiltering/sample/Program.cs diff --git a/samples/HostFilteringSample/Properties/launchSettings.json b/src/Middleware/HostFiltering/sample/Properties/launchSettings.json similarity index 100% rename from samples/HostFilteringSample/Properties/launchSettings.json rename to src/Middleware/HostFiltering/sample/Properties/launchSettings.json diff --git a/samples/HostFilteringSample/Startup.cs b/src/Middleware/HostFiltering/sample/Startup.cs similarity index 100% rename from samples/HostFilteringSample/Startup.cs rename to src/Middleware/HostFiltering/sample/Startup.cs diff --git a/samples/HostFilteringSample/appsettings.Development.json b/src/Middleware/HostFiltering/sample/appsettings.Development.json similarity index 100% rename from samples/HostFilteringSample/appsettings.Development.json rename to src/Middleware/HostFiltering/sample/appsettings.Development.json diff --git a/samples/HostFilteringSample/appsettings.Production.json b/src/Middleware/HostFiltering/sample/appsettings.Production.json similarity index 100% rename from samples/HostFilteringSample/appsettings.Production.json rename to src/Middleware/HostFiltering/sample/appsettings.Production.json diff --git a/samples/HostFilteringSample/appsettings.json b/src/Middleware/HostFiltering/sample/appsettings.json similarity index 100% rename from samples/HostFilteringSample/appsettings.json rename to src/Middleware/HostFiltering/sample/appsettings.json diff --git a/src/Microsoft.AspNetCore.HostFiltering/HostFilteringBuilderExtensions.cs b/src/Middleware/HostFiltering/src/HostFilteringBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HostFiltering/HostFilteringBuilderExtensions.cs rename to src/Middleware/HostFiltering/src/HostFilteringBuilderExtensions.cs diff --git a/src/Microsoft.AspNetCore.HostFiltering/HostFilteringMiddleware.cs b/src/Middleware/HostFiltering/src/HostFilteringMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.HostFiltering/HostFilteringMiddleware.cs rename to src/Middleware/HostFiltering/src/HostFilteringMiddleware.cs diff --git a/src/Microsoft.AspNetCore.HostFiltering/HostFilteringOptions.cs b/src/Middleware/HostFiltering/src/HostFilteringOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HostFiltering/HostFilteringOptions.cs rename to src/Middleware/HostFiltering/src/HostFilteringOptions.cs diff --git a/src/Microsoft.AspNetCore.HostFiltering/HostFilteringServicesExtensions.cs b/src/Middleware/HostFiltering/src/HostFilteringServicesExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HostFiltering/HostFilteringServicesExtensions.cs rename to src/Middleware/HostFiltering/src/HostFilteringServicesExtensions.cs diff --git a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj new file mode 100644 index 0000000000..a8eb42bb02 --- /dev/null +++ b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj @@ -0,0 +1,18 @@ + + + + + ASP.NET Core middleware for filtering out requests with unknown HTTP host headers. + + netstandard2.0 + true + aspnetcore + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.HostFiltering/baseline.netcore.json b/src/Middleware/HostFiltering/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.HostFiltering/baseline.netcore.json rename to src/Middleware/HostFiltering/src/baseline.netcore.json diff --git a/test/Microsoft.AspNetCore.HostFiltering.Tests/HostFilteringMiddlewareTests.cs b/src/Middleware/HostFiltering/test/HostFilteringMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.HostFiltering.Tests/HostFilteringMiddlewareTests.cs rename to src/Middleware/HostFiltering/test/HostFilteringMiddlewareTests.cs diff --git a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj new file mode 100644 index 0000000000..a430a2df23 --- /dev/null +++ b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj @@ -0,0 +1,12 @@ + + + + $(StandardTestTfms) + + + + + + + + diff --git a/src/Middleware/HttpOverrides/sample/HttpOverridesSample.csproj b/src/Middleware/HttpOverrides/sample/HttpOverridesSample.csproj new file mode 100644 index 0000000000..7b8a31369d --- /dev/null +++ b/src/Middleware/HttpOverrides/sample/HttpOverridesSample.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp3.0 + + + + + + + + diff --git a/samples/HttpOverridesSample/Properties/launchSettings.json b/src/Middleware/HttpOverrides/sample/Properties/launchSettings.json similarity index 100% rename from samples/HttpOverridesSample/Properties/launchSettings.json rename to src/Middleware/HttpOverrides/sample/Properties/launchSettings.json diff --git a/samples/HttpOverridesSample/Startup.cs b/src/Middleware/HttpOverrides/sample/Startup.cs similarity index 100% rename from samples/HttpOverridesSample/Startup.cs rename to src/Middleware/HttpOverrides/sample/Startup.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs b/src/Middleware/HttpOverrides/src/ForwardedHeaders.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs rename to src/Middleware/HttpOverrides/src/ForwardedHeaders.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersDefaults.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersDefaults.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersDefaults.cs rename to src/Middleware/HttpOverrides/src/ForwardedHeadersDefaults.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersExtensions.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersExtensions.cs rename to src/Middleware/HttpOverrides/src/ForwardedHeadersExtensions.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersMiddleware.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersMiddleware.cs rename to src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersOptions.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeadersOptions.cs rename to src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs b/src/Middleware/HttpOverrides/src/HttpMethodOverrideExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs rename to src/Middleware/HttpOverrides/src/HttpMethodOverrideExtensions.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs b/src/Middleware/HttpOverrides/src/HttpMethodOverrideMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs rename to src/Middleware/HttpOverrides/src/HttpMethodOverrideMiddleware.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs b/src/Middleware/HttpOverrides/src/HttpMethodOverrideOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs rename to src/Middleware/HttpOverrides/src/HttpMethodOverrideOptions.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/IPNetwork.cs b/src/Middleware/HttpOverrides/src/IPNetwork.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/IPNetwork.cs rename to src/Middleware/HttpOverrides/src/IPNetwork.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/Internal/IPEndPointParser.cs b/src/Middleware/HttpOverrides/src/Internal/IPEndPointParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/Internal/IPEndPointParser.cs rename to src/Middleware/HttpOverrides/src/Internal/IPEndPointParser.cs diff --git a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj similarity index 57% rename from src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj rename to src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj index c922f7f94f..11b2130693 100644 --- a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.HttpOverrides/baseline.net45.json b/src/Middleware/HttpOverrides/src/baseline.net45.json similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/baseline.net45.json rename to src/Middleware/HttpOverrides/src/baseline.net45.json diff --git a/src/Microsoft.AspNetCore.HttpOverrides/baseline.netcore.json b/src/Middleware/HttpOverrides/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.HttpOverrides/baseline.netcore.json rename to src/Middleware/HttpOverrides/src/baseline.netcore.json diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/ForwardedHeadersMiddlewareTest.cs b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpOverrides.Tests/ForwardedHeadersMiddlewareTest.cs rename to src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs b/src/Middleware/HttpOverrides/test/HttpMethodOverrideMiddlewareTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs rename to src/Middleware/HttpOverrides/test/HttpMethodOverrideMiddlewareTest.cs diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs b/src/Middleware/HttpOverrides/test/IPEndPointParserTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs rename to src/Middleware/HttpOverrides/test/IPEndPointParserTest.cs diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPNetworkTest.cs b/src/Middleware/HttpOverrides/test/IPNetworkTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpOverrides.Tests/IPNetworkTest.cs rename to src/Middleware/HttpOverrides/test/IPNetworkTest.cs diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj similarity index 58% rename from test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj rename to src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index 5f8209ea44..880dffd329 100644 --- a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj +++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -5,7 +5,8 @@ - + + diff --git a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj new file mode 100644 index 0000000000..aea2ed8ba3 --- /dev/null +++ b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp3.0 + + + + + + + + + + diff --git a/samples/HttpsPolicySample/Properties/launchSettings.json b/src/Middleware/HttpsPolicy/sample/Properties/launchSettings.json similarity index 100% rename from samples/HttpsPolicySample/Properties/launchSettings.json rename to src/Middleware/HttpsPolicy/sample/Properties/launchSettings.json diff --git a/samples/HttpsPolicySample/Startup.cs b/src/Middleware/HttpsPolicy/sample/Startup.cs similarity index 100% rename from samples/HttpsPolicySample/Startup.cs rename to src/Middleware/HttpsPolicy/sample/Startup.cs diff --git a/samples/HttpsPolicySample/testCert.pfx b/src/Middleware/HttpsPolicy/sample/testCert.pfx similarity index 100% rename from samples/HttpsPolicySample/testCert.pfx rename to src/Middleware/HttpsPolicy/sample/testCert.pfx diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HstsBuilderExtensions.cs b/src/Middleware/HttpsPolicy/src/HstsBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HstsBuilderExtensions.cs rename to src/Middleware/HttpsPolicy/src/HstsBuilderExtensions.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HstsMiddleware.cs b/src/Middleware/HttpsPolicy/src/HstsMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HstsMiddleware.cs rename to src/Middleware/HttpsPolicy/src/HstsMiddleware.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HstsOptions.cs b/src/Middleware/HttpsPolicy/src/HstsOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HstsOptions.cs rename to src/Middleware/HttpsPolicy/src/HstsOptions.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HstsServicesExtensions.cs b/src/Middleware/HttpsPolicy/src/HstsServicesExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HstsServicesExtensions.cs rename to src/Middleware/HttpsPolicy/src/HstsServicesExtensions.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionBuilderExtensions.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionBuilderExtensions.cs rename to src/Middleware/HttpsPolicy/src/HttpsRedirectionBuilderExtensions.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionMiddleware.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionMiddleware.cs rename to src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionOptions.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionOptions.cs rename to src/Middleware/HttpsPolicy/src/HttpsRedirectionOptions.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionServicesExtensions.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionServicesExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/HttpsRedirectionServicesExtensions.cs rename to src/Middleware/HttpsPolicy/src/HttpsRedirectionServicesExtensions.cs diff --git a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj new file mode 100644 index 0000000000..f367ea28cc --- /dev/null +++ b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj @@ -0,0 +1,20 @@ + + + + + ASP.NET Core basic middleware for supporting HTTPS Redirection and HTTP Strict-Transport-Security. + + netstandard2.0 + $(NoWarn);CS1591 + true + aspnetcore;https;hsts + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/baseline.netcore.json b/src/Middleware/HttpsPolicy/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/baseline.netcore.json rename to src/Middleware/HttpsPolicy/src/baseline.netcore.json diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/internal/HstsLoggingExtensions.cs b/src/Middleware/HttpsPolicy/src/internal/HstsLoggingExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/internal/HstsLoggingExtensions.cs rename to src/Middleware/HttpsPolicy/src/internal/HstsLoggingExtensions.cs diff --git a/src/Microsoft.AspNetCore.HttpsPolicy/internal/HttpsLoggingExtensions.cs b/src/Middleware/HttpsPolicy/src/internal/HttpsLoggingExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.HttpsPolicy/internal/HttpsLoggingExtensions.cs rename to src/Middleware/HttpsPolicy/src/internal/HttpsLoggingExtensions.cs diff --git a/test/Microsoft.AspNetCore.HttpsPolicy.Tests/HstsMiddlewareTests.cs b/src/Middleware/HttpsPolicy/test/HstsMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpsPolicy.Tests/HstsMiddlewareTests.cs rename to src/Middleware/HttpsPolicy/test/HstsMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.HttpsPolicy.Tests/HttpsPolicyTests.cs b/src/Middleware/HttpsPolicy/test/HttpsPolicyTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpsPolicy.Tests/HttpsPolicyTests.cs rename to src/Middleware/HttpsPolicy/test/HttpsPolicyTests.cs diff --git a/test/Microsoft.AspNetCore.HttpsPolicy.Tests/HttpsRedirectionMiddlewareTests.cs b/src/Middleware/HttpsPolicy/test/HttpsRedirectionMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.HttpsPolicy.Tests/HttpsRedirectionMiddlewareTests.cs rename to src/Middleware/HttpsPolicy/test/HttpsRedirectionMiddlewareTests.cs diff --git a/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj b/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj new file mode 100644 index 0000000000..9b8934b69c --- /dev/null +++ b/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj @@ -0,0 +1,11 @@ + + + + netcoreapp3.0 + + + + + + + diff --git a/benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/AssemblyInfo.cs b/src/Middleware/ResponseCompression/perf/AssemblyInfo.cs similarity index 100% rename from benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/AssemblyInfo.cs rename to src/Middleware/ResponseCompression/perf/AssemblyInfo.cs diff --git a/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj b/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj new file mode 100644 index 0000000000..22d6db441c --- /dev/null +++ b/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Benchmarks.csproj @@ -0,0 +1,16 @@ + + + + Exe + netcoreapp3.0 + + + + + + + + + + + diff --git a/benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/ResponseCompressionProviderBenchmark.cs b/src/Middleware/ResponseCompression/perf/ResponseCompressionProviderBenchmark.cs similarity index 100% rename from benchmarks/Microsoft.AspNetCore.ResponseCompression.Benchmarks/ResponseCompressionProviderBenchmark.cs rename to src/Middleware/ResponseCompression/perf/ResponseCompressionProviderBenchmark.cs diff --git a/samples/ResponseCompressionSample/CustomCompressionProvider.cs b/src/Middleware/ResponseCompression/sample/CustomCompressionProvider.cs similarity index 100% rename from samples/ResponseCompressionSample/CustomCompressionProvider.cs rename to src/Middleware/ResponseCompression/sample/CustomCompressionProvider.cs diff --git a/samples/ResponseCompressionSample/LoremIpsum.cs b/src/Middleware/ResponseCompression/sample/LoremIpsum.cs similarity index 100% rename from samples/ResponseCompressionSample/LoremIpsum.cs rename to src/Middleware/ResponseCompression/sample/LoremIpsum.cs diff --git a/samples/ResponseCompressionSample/Properties/launchSettings.json b/src/Middleware/ResponseCompression/sample/Properties/launchSettings.json similarity index 100% rename from samples/ResponseCompressionSample/Properties/launchSettings.json rename to src/Middleware/ResponseCompression/sample/Properties/launchSettings.json diff --git a/src/Middleware/ResponseCompression/sample/ResponseCompressionSample.csproj b/src/Middleware/ResponseCompression/sample/ResponseCompressionSample.csproj new file mode 100644 index 0000000000..434c42ba0c --- /dev/null +++ b/src/Middleware/ResponseCompression/sample/ResponseCompressionSample.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + + diff --git a/samples/ResponseCompressionSample/Startup.cs b/src/Middleware/ResponseCompression/sample/Startup.cs similarity index 100% rename from samples/ResponseCompressionSample/Startup.cs rename to src/Middleware/ResponseCompression/sample/Startup.cs diff --git a/samples/ResponseCompressionSample/testfile1kb.txt b/src/Middleware/ResponseCompression/sample/testfile1kb.txt similarity index 100% rename from samples/ResponseCompressionSample/testfile1kb.txt rename to src/Middleware/ResponseCompression/sample/testfile1kb.txt diff --git a/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs b/src/Middleware/ResponseCompression/src/BodyWrapperStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs rename to src/Middleware/ResponseCompression/src/BodyWrapperStream.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/BrotliCompressionProvider.cs b/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/BrotliCompressionProvider.cs rename to src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/BrotliCompressionProviderOptions.cs b/src/Middleware/ResponseCompression/src/BrotliCompressionProviderOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/BrotliCompressionProviderOptions.cs rename to src/Middleware/ResponseCompression/src/BrotliCompressionProviderOptions.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs b/src/Middleware/ResponseCompression/src/CompressionProviderCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs rename to src/Middleware/ResponseCompression/src/CompressionProviderCollection.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderFactory.cs b/src/Middleware/ResponseCompression/src/CompressionProviderFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderFactory.cs rename to src/Middleware/ResponseCompression/src/CompressionProviderFactory.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs b/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs rename to src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProviderOptions.cs b/src/Middleware/ResponseCompression/src/GzipCompressionProviderOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProviderOptions.cs rename to src/Middleware/ResponseCompression/src/GzipCompressionProviderOptions.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ICompressionProvider.cs b/src/Middleware/ResponseCompression/src/ICompressionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ICompressionProvider.cs rename to src/Middleware/ResponseCompression/src/ICompressionProvider.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/IResponseCompressionProvider.cs b/src/Middleware/ResponseCompression/src/IResponseCompressionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/IResponseCompressionProvider.cs rename to src/Middleware/ResponseCompression/src/IResponseCompressionProvider.cs diff --git a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj new file mode 100644 index 0000000000..f35baf967d --- /dev/null +++ b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj @@ -0,0 +1,16 @@ + + + + ASP.NET Core middleware for HTTP Response compression. + netcoreapp3.0 + true + aspnetcore + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.ResponseCompression/Properties/AssemblyInfo.cs b/src/Middleware/ResponseCompression/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/Properties/AssemblyInfo.cs rename to src/Middleware/ResponseCompression/src/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionBuilderExtensions.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionBuilderExtensions.cs rename to src/Middleware/ResponseCompression/src/ResponseCompressionBuilderExtensions.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionDefaults.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionDefaults.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionDefaults.cs rename to src/Middleware/ResponseCompression/src/ResponseCompressionDefaults.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionMiddleware.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionMiddleware.cs rename to src/Middleware/ResponseCompression/src/ResponseCompressionMiddleware.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionOptions.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionOptions.cs rename to src/Middleware/ResponseCompression/src/ResponseCompressionOptions.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionProvider.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionProvider.cs rename to src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionServicesExtensions.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionServicesExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/ResponseCompressionServicesExtensions.cs rename to src/Middleware/ResponseCompression/src/ResponseCompressionServicesExtensions.cs diff --git a/src/Microsoft.AspNetCore.ResponseCompression/baseline.netcore.json b/src/Middleware/ResponseCompression/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/baseline.netcore.json rename to src/Middleware/ResponseCompression/src/baseline.netcore.json diff --git a/src/Microsoft.AspNetCore.ResponseCompression/baseline.netframework.json b/src/Middleware/ResponseCompression/src/baseline.netframework.json similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/baseline.netframework.json rename to src/Middleware/ResponseCompression/src/baseline.netframework.json diff --git a/src/Microsoft.AspNetCore.ResponseCompression/internal/ResponseCompressionLoggingExtensions.cs b/src/Middleware/ResponseCompression/src/internal/ResponseCompressionLoggingExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.ResponseCompression/internal/ResponseCompressionLoggingExtensions.cs rename to src/Middleware/ResponseCompression/src/internal/ResponseCompressionLoggingExtensions.cs diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs b/src/Middleware/ResponseCompression/test/BodyWrapperStreamTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs rename to src/Middleware/ResponseCompression/test/BodyWrapperStreamTests.cs diff --git a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj new file mode 100644 index 0000000000..31825936de --- /dev/null +++ b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj @@ -0,0 +1,19 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs rename to src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/testfile1kb.txt b/src/Middleware/ResponseCompression/test/testfile1kb.txt similarity index 100% rename from test/Microsoft.AspNetCore.ResponseCompression.Tests/testfile1kb.txt rename to src/Middleware/ResponseCompression/test/testfile1kb.txt diff --git a/samples/RewriteSample/Properties/launchSettings.json b/src/Middleware/Rewrite/sample/Properties/launchSettings.json similarity index 100% rename from samples/RewriteSample/Properties/launchSettings.json rename to src/Middleware/Rewrite/sample/Properties/launchSettings.json diff --git a/samples/RewriteSample/Rewrite.txt b/src/Middleware/Rewrite/sample/Rewrite.txt similarity index 100% rename from samples/RewriteSample/Rewrite.txt rename to src/Middleware/Rewrite/sample/Rewrite.txt diff --git a/src/Middleware/Rewrite/sample/RewriteSample.csproj b/src/Middleware/Rewrite/sample/RewriteSample.csproj new file mode 100644 index 0000000000..7869723e48 --- /dev/null +++ b/src/Middleware/Rewrite/sample/RewriteSample.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/samples/RewriteSample/Startup.cs b/src/Middleware/Rewrite/sample/Startup.cs similarity index 100% rename from samples/RewriteSample/Startup.cs rename to src/Middleware/Rewrite/sample/Startup.cs diff --git a/samples/RewriteSample/UrlRewrite.xml b/src/Middleware/Rewrite/sample/UrlRewrite.xml similarity index 100% rename from samples/RewriteSample/UrlRewrite.xml rename to src/Middleware/Rewrite/sample/UrlRewrite.xml diff --git a/samples/RewriteSample/testCert.pfx b/src/Middleware/Rewrite/sample/testCert.pfx similarity index 100% rename from samples/RewriteSample/testCert.pfx rename to src/Middleware/Rewrite/sample/testCert.pfx diff --git a/src/Microsoft.AspNetCore.Rewrite/ApacheModRewriteOptionsExtensions.cs b/src/Middleware/Rewrite/src/ApacheModRewriteOptionsExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/ApacheModRewriteOptionsExtensions.cs rename to src/Middleware/Rewrite/src/ApacheModRewriteOptionsExtensions.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Extensions/RewriteMiddlewareLoggingExtensions.cs b/src/Middleware/Rewrite/src/Extensions/RewriteMiddlewareLoggingExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Extensions/RewriteMiddlewareLoggingExtensions.cs rename to src/Middleware/Rewrite/src/Extensions/RewriteMiddlewareLoggingExtensions.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/IISUrlRewriteOptionsExtensions.cs b/src/Middleware/Rewrite/src/IISUrlRewriteOptionsExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/IISUrlRewriteOptionsExtensions.cs rename to src/Middleware/Rewrite/src/IISUrlRewriteOptionsExtensions.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/IRule.cs b/src/Middleware/Rewrite/src/IRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/IRule.cs rename to src/Middleware/Rewrite/src/IRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ApacheModRewriteRule.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ApacheModRewriteRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ApacheModRewriteRule.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ApacheModRewriteRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Condition.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/Condition.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Condition.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/Condition.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionEvaluator.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ConditionEvaluator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionEvaluator.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ConditionEvaluator.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionPatternParser.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ConditionPatternParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionPatternParser.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ConditionPatternParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionType.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ConditionType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionType.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ConditionType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/CookieActionFactory.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/CookieActionFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/CookieActionFactory.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/CookieActionFactory.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FileParser.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/FileParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FileParser.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/FileParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FlagParser.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/FlagParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FlagParser.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/FlagParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FlagType.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/FlagType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FlagType.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/FlagType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Flags.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/Flags.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Flags.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/Flags.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/OperationType.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/OperationType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/OperationType.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/OperationType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ParsedModRewriteCondition.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ParsedModRewriteCondition.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ParsedModRewriteCondition.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ParsedModRewriteCondition.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/RuleBuilder.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/RuleBuilder.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/RuleBuilder.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/RuleBuilder.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/RuleRegexParser.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/RuleRegexParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/RuleRegexParser.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/RuleRegexParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/SegmentType.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/SegmentType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/SegmentType.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/SegmentType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ServerVariables.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ServerVariables.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ServerVariables.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/ServerVariables.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/TestStringParser.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/TestStringParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/TestStringParser.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/TestStringParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Tokenizer.cs b/src/Middleware/Rewrite/src/Internal/ApacheModRewrite/Tokenizer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Tokenizer.cs rename to src/Middleware/Rewrite/src/Internal/ApacheModRewrite/Tokenizer.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/BackReferenceCollection.cs b/src/Middleware/Rewrite/src/Internal/BackReferenceCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/BackReferenceCollection.cs rename to src/Middleware/Rewrite/src/Internal/BackReferenceCollection.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/DelegateRule.cs b/src/Middleware/Rewrite/src/Internal/DelegateRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/DelegateRule.cs rename to src/Middleware/Rewrite/src/Internal/DelegateRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ActionType.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ActionType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ActionType.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ActionType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/Condition.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/Condition.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/Condition.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/Condition.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ConditionCollection.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ConditionCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ConditionCollection.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ConditionCollection.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ConditionEvaluator.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ConditionEvaluator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ConditionEvaluator.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ConditionEvaluator.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISRewriteMap.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/IISRewriteMap.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISRewriteMap.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/IISRewriteMap.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISRewriteMapCollection.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/IISRewriteMapCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISRewriteMapCollection.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/IISRewriteMapCollection.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISUrlRewriteRule.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/IISUrlRewriteRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISUrlRewriteRule.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/IISUrlRewriteRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/InputParser.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/InputParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/InputParser.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/InputParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/InvalidUrlRewriteFormatException.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/InvalidUrlRewriteFormatException.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/InvalidUrlRewriteFormatException.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/InvalidUrlRewriteFormatException.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/LogicalGrouping.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/LogicalGrouping.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/LogicalGrouping.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/LogicalGrouping.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/MatchType.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/MatchType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/MatchType.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/MatchType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/PatternSyntax.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/PatternSyntax.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/PatternSyntax.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/PatternSyntax.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RedirectType.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/RedirectType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RedirectType.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/RedirectType.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteMapParser.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/RewriteMapParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteMapParser.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/RewriteMapParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/RewriteTags.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/RewriteTags.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ServerVariables.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/ServerVariables.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UriMatchCondition.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UriMatchCondition.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UriMatchCondition.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UriMatchCondition.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UriMatchPart.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UriMatchPart.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UriMatchPart.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UriMatchPart.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UrlRewriteFileParser.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UrlRewriteFileParser.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs b/src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs rename to src/Middleware/Rewrite/src/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/MatchResults.cs b/src/Middleware/Rewrite/src/Internal/MatchResults.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/MatchResults.cs rename to src/Middleware/Rewrite/src/Internal/MatchResults.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/ParserContext.cs b/src/Middleware/Rewrite/src/Internal/ParserContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/ParserContext.cs rename to src/Middleware/Rewrite/src/Internal/ParserContext.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/Pattern.cs b/src/Middleware/Rewrite/src/Internal/Pattern.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/Pattern.cs rename to src/Middleware/Rewrite/src/Internal/Pattern.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/ConditionMatchSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/ConditionMatchSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/ConditionMatchSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/ConditionMatchSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/DateTimeSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/DateTimeSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/DateTimeSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/DateTimeSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/HeaderSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/HeaderSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/HeaderSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/HeaderSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/IsHttpsModSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/IsHttpsModSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/IsHttpsModSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/IsHttpsModSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/IsHttpsUrlSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/IsHttpsUrlSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/IsHttpsUrlSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/IsHttpsUrlSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/IsIPV6Segment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/IsIPV6Segment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/IsIPV6Segment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/IsIPV6Segment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/LiteralSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/LiteralSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/LiteralSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/LiteralSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/LocalAddressSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/LocalAddressSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/LocalAddressSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/LocalAddressSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/LocalPortSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/LocalPortSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/LocalPortSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/LocalPortSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/QueryStringSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/QueryStringSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/QueryStringSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/QueryStringSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RemoteAddressSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/RemoteAddressSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RemoteAddressSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/RemoteAddressSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RemotePortSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/RemotePortSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RemotePortSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/RemotePortSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RequestFilenameSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/RequestFilenameSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RequestFilenameSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/RequestFilenameSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RequestMethodSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/RequestMethodSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RequestMethodSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/RequestMethodSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RewriteMapSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/RewriteMapSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RewriteMapSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/RewriteMapSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RuleMatchSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/RuleMatchSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/RuleMatchSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/RuleMatchSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/SchemeSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/SchemeSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/SchemeSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/SchemeSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/ServerProtocolSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/ServerProtocolSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/ServerProtocolSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/ServerProtocolSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/ToLowerSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/ToLowerSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/ToLowerSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/ToLowerSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/UrlEncodeSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/UrlEncodeSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/UrlEncodeSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/UrlEncodeSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/UrlSegment.cs b/src/Middleware/Rewrite/src/Internal/PatternSegments/UrlSegment.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/PatternSegments/UrlSegment.cs rename to src/Middleware/Rewrite/src/Internal/PatternSegments/UrlSegment.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/RedirectRule.cs b/src/Middleware/Rewrite/src/Internal/RedirectRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/RedirectRule.cs rename to src/Middleware/Rewrite/src/Internal/RedirectRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/RedirectToHttpsRule.cs b/src/Middleware/Rewrite/src/Internal/RedirectToHttpsRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/RedirectToHttpsRule.cs rename to src/Middleware/Rewrite/src/Internal/RedirectToHttpsRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/RedirectToWwwRule.cs b/src/Middleware/Rewrite/src/Internal/RedirectToWwwRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/RedirectToWwwRule.cs rename to src/Middleware/Rewrite/src/Internal/RedirectToWwwRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/RewriteRule.cs b/src/Middleware/Rewrite/src/Internal/RewriteRule.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/RewriteRule.cs rename to src/Middleware/Rewrite/src/Internal/RewriteRule.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlAction.cs b/src/Middleware/Rewrite/src/Internal/UrlAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/AbortAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/AbortAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/AbortAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/AbortAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/ChangeCookieAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/ChangeCookieAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/ChangeCookieAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/ChangeCookieAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/CustomResponseAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/CustomResponseAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/CustomResponseAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/CustomResponseAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/ForbiddenAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/ForbiddenAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/ForbiddenAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/ForbiddenAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/GoneAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/GoneAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/GoneAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/GoneAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/NoneAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/NoneAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/NoneAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/NoneAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/RedirectAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/RedirectAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/RedirectAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/RedirectAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/RewriteAction.cs b/src/Middleware/Rewrite/src/Internal/UrlActions/RewriteAction.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/RewriteAction.cs rename to src/Middleware/Rewrite/src/Internal/UrlActions/RewriteAction.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/ExactMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/ExactMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/ExactMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/ExactMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/FileSizeMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/FileSizeMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/FileSizeMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/FileSizeMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IntegerMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/IntegerMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IntegerMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/IntegerMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IntegerOperation.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/IntegerOperation.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IntegerOperation.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/IntegerOperation.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IsDirectoryMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/IsDirectoryMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IsDirectoryMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/IsDirectoryMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IsFileMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/IsFileMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/IsFileMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/IsFileMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/RegexMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/RegexMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/RegexMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/RegexMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/StringMatch.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/StringMatch.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/StringMatch.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/StringMatch.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/StringOperation.cs b/src/Middleware/Rewrite/src/Internal/UrlMatches/StringOperation.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Internal/UrlMatches/StringOperation.cs rename to src/Middleware/Rewrite/src/Internal/UrlMatches/StringOperation.cs diff --git a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj new file mode 100644 index 0000000000..48a6e913f5 --- /dev/null +++ b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj @@ -0,0 +1,23 @@ + + + + ASP.NET Core basic middleware for rewriting URLs. Includes: +* Support for custom URL rewrite rules +* Support for running IIS URL Rewrite module rules +* Support for running Apache mod_rewrite rules. + netstandard2.0 + $(NoWarn);CS1591 + true + aspnetcore;urlrewrite;mod_rewrite + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Rewrite/Properties/AssemblyInfo.cs b/src/Middleware/Rewrite/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Properties/AssemblyInfo.cs rename to src/Middleware/Rewrite/src/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Properties/Resources.Designer.cs b/src/Middleware/Rewrite/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Properties/Resources.Designer.cs rename to src/Middleware/Rewrite/src/Properties/Resources.Designer.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/Resources.resx b/src/Middleware/Rewrite/src/Resources.resx similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/Resources.resx rename to src/Middleware/Rewrite/src/Resources.resx diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteBuilderExtensions.cs b/src/Middleware/Rewrite/src/RewriteBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/RewriteBuilderExtensions.cs rename to src/Middleware/Rewrite/src/RewriteBuilderExtensions.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteContext.cs b/src/Middleware/Rewrite/src/RewriteContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/RewriteContext.cs rename to src/Middleware/Rewrite/src/RewriteContext.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs b/src/Middleware/Rewrite/src/RewriteMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs rename to src/Middleware/Rewrite/src/RewriteMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteOptions.cs b/src/Middleware/Rewrite/src/RewriteOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/RewriteOptions.cs rename to src/Middleware/Rewrite/src/RewriteOptions.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/RewriteOptionsExtensions.cs b/src/Middleware/Rewrite/src/RewriteOptionsExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/RewriteOptionsExtensions.cs rename to src/Middleware/Rewrite/src/RewriteOptionsExtensions.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/RuleResult.cs b/src/Middleware/Rewrite/src/RuleResult.cs similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/RuleResult.cs rename to src/Middleware/Rewrite/src/RuleResult.cs diff --git a/src/Microsoft.AspNetCore.Rewrite/baseline.netcore.json b/src/Middleware/Rewrite/src/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Rewrite/baseline.netcore.json rename to src/Middleware/Rewrite/src/baseline.netcore.json diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/ConditionPatternParserTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/ConditionPatternParserTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/CookieActionFactoryTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/CookieActionFactoryTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/CookieActionFactoryTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/CookieActionFactoryTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/FlagParserTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/FlagParserTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/FormatExceptionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/FormatExceptionTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ModRewriteMiddlewareTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/ModRewriteMiddlewareTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ModRewriteMiddlewareTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/ModRewriteMiddlewareTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/RewriteTokenizerTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/RewriteTokenizerTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleBuilderTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/RuleBuilderTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleBuilderTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/RuleBuilderTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/RuleRegexParserTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/RuleRegexParserTest.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs b/src/Middleware/Rewrite/test/ApacheModRewrite/TestStringParserTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs rename to src/Middleware/Rewrite/test/ApacheModRewrite/TestStringParserTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/FileParserTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/FileParserTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/FormatExceptionHandlingTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/FormatExceptionHandlingTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/InputParserTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/InputParserTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InvalidUrlRewriteFormatExceptionHandlingTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/InvalidUrlRewriteFormatExceptionHandlingTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InvalidUrlRewriteFormatExceptionHandlingTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/InvalidUrlRewriteFormatExceptionHandlingTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/MiddleWareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/MiddleWareTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/RewriteMapParserTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/RewriteMapParserTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/RewriteMapParserTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/RewriteMapParserTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/ServerVariableTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/ServerVariableTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/UrlRewriteApplicationTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs rename to src/Middleware/Rewrite/test/IISUrlRewrite/UrlRewriteApplicationTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj similarity index 61% rename from test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj rename to src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj index ef02b99631..1593497c61 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj +++ b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs b/src/Middleware/Rewrite/test/MiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs rename to src/Middleware/Rewrite/test/MiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/ConditionMatchSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/ConditionMatchSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/ConditionMatchSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/ConditionMatchSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/DateTimeSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/DateTimeSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/DateTimeSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/DateTimeSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/HeaderSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/HeaderSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/HeaderSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/HeaderSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsModSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/IsHttpsModSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsModSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/IsHttpsModSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/IsHttpsSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsHttpsSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/IsHttpsSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsIPV6SegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/IsIPV6SegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/IsIPV6SegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/IsIPV6SegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/LIteralSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/LIteralSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/LIteralSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/LIteralSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/LocalAddressSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/LocalAddressSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/LocalAddressSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/LocalAddressSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/LocalPortSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/LocalPortSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/LocalPortSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/LocalPortSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/QueryStringSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/QueryStringSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/QueryStringSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/QueryStringSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RemoteAddressSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/RemoteAddressSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RemoteAddressSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/RemoteAddressSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RemotePortSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/RemotePortSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RemotePortSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/RemotePortSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestFilenameSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/RequestFilenameSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestFilenameSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/RequestFilenameSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestMethodSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/RequestMethodSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RequestMethodSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/RequestMethodSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RuleMatchSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/RuleMatchSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/RuleMatchSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/RuleMatchSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/SchemeSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/SchemeSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/SchemeSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/SchemeSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/ServerProtocolSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/ServerProtocolSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/ServerProtocolSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/ServerProtocolSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/ToLowerSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/ToLowerSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/ToLowerSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/ToLowerSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/UrlEncodeSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/UrlEncodeSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/UrlEncodeSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/UrlEncodeSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/UrlSegmentTests.cs b/src/Middleware/Rewrite/test/PatternSegments/UrlSegmentTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/PatternSegments/UrlSegmentTests.cs rename to src/Middleware/Rewrite/test/PatternSegments/UrlSegmentTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/AbortActionTests.cs b/src/Middleware/Rewrite/test/UrlActions/AbortActionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/AbortActionTests.cs rename to src/Middleware/Rewrite/test/UrlActions/AbortActionTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ChangeCookieActionTests.cs b/src/Middleware/Rewrite/test/UrlActions/ChangeCookieActionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ChangeCookieActionTests.cs rename to src/Middleware/Rewrite/test/UrlActions/ChangeCookieActionTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs b/src/Middleware/Rewrite/test/UrlActions/ForbiddenActionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/ForbiddenActionTests.cs rename to src/Middleware/Rewrite/test/UrlActions/ForbiddenActionTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs b/src/Middleware/Rewrite/test/UrlActions/GoneActionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlActions/GoneActionTests.cs rename to src/Middleware/Rewrite/test/UrlActions/GoneActionTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/ExactMatchTests.cs b/src/Middleware/Rewrite/test/UrlMatches/ExactMatchTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/ExactMatchTests.cs rename to src/Middleware/Rewrite/test/UrlMatches/ExactMatchTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/IntegerMatchTests.cs b/src/Middleware/Rewrite/test/UrlMatches/IntegerMatchTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/IntegerMatchTests.cs rename to src/Middleware/Rewrite/test/UrlMatches/IntegerMatchTests.cs diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/StringMatchTests.cs b/src/Middleware/Rewrite/test/UrlMatches/StringMatchTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Rewrite.Tests/UrlMatches/StringMatchTests.cs rename to src/Middleware/Rewrite/test/UrlMatches/StringMatchTests.cs diff --git a/test/Directory.Build.props b/test/Directory.Build.props deleted file mode 100644 index bea39a089d..0000000000 --- a/test/Directory.Build.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - - $(StandardTestTfms);net461 - - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs b/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs deleted file mode 100644 index 81aa993e98..0000000000 --- a/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs +++ /dev/null @@ -1,315 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.TestHost; -using Xunit; - -namespace Microsoft.AspNetCore.Buffering.Tests -{ - public class ResponseBufferingMiddlewareTests - { - [Fact] - public async Task BufferResponse_SetsContentLength() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - await context.Response.WriteAsync("Hello World"); - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("Hello World", await response.Content.ReadAsStringAsync()); - - // Set automatically by buffer - IEnumerable values; - Assert.True(response.Content.Headers.TryGetValues("Content-Length", out values)); - Assert.Equal("11", values.FirstOrDefault()); - } - - [Fact] - public async Task BufferResponseWithManualContentLength_NotReplaced() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - context.Response.ContentLength = 12; - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - await context.Response.WriteAsync("Hello World"); - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("Hello World", await response.Content.ReadAsStringAsync()); - - IEnumerable values; - Assert.True(response.Content.Headers.TryGetValues("Content-Length", out values)); - Assert.Equal("12", values.FirstOrDefault()); - } - - [Fact] - public async Task Seek_AllowsResttingBuffer() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - var body = context.Response.Body; - Assert.False(context.Response.HasStarted); - Assert.True(body.CanSeek); - Assert.Equal(0, body.Position); - Assert.Equal(0, body.Length); - - await context.Response.WriteAsync("Hello World"); - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - Assert.Equal(11, body.Position); - Assert.Equal(11, body.Length); - - Assert.Throws(() => body.Seek(1, SeekOrigin.Begin)); - Assert.Throws(() => body.Seek(0, SeekOrigin.Current)); - Assert.Throws(() => body.Seek(0, SeekOrigin.End)); - - Assert.Equal(0, body.Seek(0, SeekOrigin.Begin)); - Assert.Equal(0, body.Position); - Assert.Equal(0, body.Length); - - await context.Response.WriteAsync("12345"); - Assert.Equal(5, body.Position); - Assert.Equal(5, body.Length); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("12345", await response.Content.ReadAsStringAsync()); - - // Set automatically by buffer - IEnumerable values; - Assert.True(response.Content.Headers.TryGetValues("Content-Length", out values)); - Assert.Equal("5", values.FirstOrDefault()); - } - - [Fact] - public async Task SetPosition_AllowsResttingBuffer() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - var body = context.Response.Body; - Assert.False(context.Response.HasStarted); - Assert.True(body.CanSeek); - Assert.Equal(0, body.Position); - Assert.Equal(0, body.Length); - - await context.Response.WriteAsync("Hello World"); - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - Assert.Equal(11, body.Position); - Assert.Equal(11, body.Length); - - Assert.Throws(() => body.Position = 1); - - body.Position = 0; - Assert.Equal(0, body.Position); - Assert.Equal(0, body.Length); - - await context.Response.WriteAsync("12345"); - Assert.Equal(5, body.Position); - Assert.Equal(5, body.Length); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("12345", await response.Content.ReadAsStringAsync()); - - // Set automatically by buffer - IEnumerable values; - Assert.True(response.Content.Headers.TryGetValues("Content-Length", out values)); - Assert.Equal("5", values.FirstOrDefault()); - } - - [Fact] - public async Task SetLength_AllowsResttingBuffer() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - var body = context.Response.Body; - Assert.False(context.Response.HasStarted); - Assert.True(body.CanSeek); - Assert.Equal(0, body.Position); - Assert.Equal(0, body.Length); - - await context.Response.WriteAsync("Hello World"); - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - Assert.Equal(11, body.Position); - Assert.Equal(11, body.Length); - - Assert.Throws(() => body.SetLength(1)); - - body.SetLength(0); - Assert.Equal(0, body.Position); - Assert.Equal(0, body.Length); - - await context.Response.WriteAsync("12345"); - Assert.Equal(5, body.Position); - Assert.Equal(5, body.Length); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("12345", await response.Content.ReadAsStringAsync()); - - // Set automatically by buffer - IEnumerable values; - Assert.True(response.Content.Headers.TryGetValues("Content-Length", out values)); - Assert.Equal("5", values.FirstOrDefault()); - } - - [Fact] - public async Task DisableBufferingViaFeature() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - - var bufferingFeature = context.Features.Get(); - Assert.NotNull(bufferingFeature); - bufferingFeature.DisableResponseBuffering(); - - Assert.False(context.Response.HasStarted); - Assert.False(context.Response.Body.CanSeek); - - await context.Response.WriteAsync("Hello World"); - - Assert.True(context.Response.HasStarted); - Assert.False(context.Response.Body.CanSeek); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("Hello World", await response.Content.ReadAsStringAsync()); - IEnumerable values; - Assert.False(response.Content.Headers.TryGetValues("Content-Length", out values)); - } - - [Fact] - public async Task DisableBufferingViaFeatureAfterFirstWrite_Flushes() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - - await context.Response.WriteAsync("Hello"); - - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - - var bufferingFeature = context.Features.Get(); - Assert.NotNull(bufferingFeature); - bufferingFeature.DisableResponseBuffering(); - - Assert.True(context.Response.HasStarted); - Assert.False(context.Response.Body.CanSeek); - - await context.Response.WriteAsync(" World"); - - Assert.True(context.Response.HasStarted); - Assert.False(context.Response.Body.CanSeek); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("Hello World", await response.Content.ReadAsStringAsync()); - IEnumerable values; - Assert.False(response.Content.Headers.TryGetValues("Content-Length", out values)); - } - - [Fact] - public async Task FlushDisablesBuffering() - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseResponseBuffering(); - app.Run(async context => - { - Assert.False(context.Response.HasStarted); - Assert.True(context.Response.Body.CanSeek); - - context.Response.Body.Flush(); - - Assert.True(context.Response.HasStarted); - Assert.False(context.Response.Body.CanSeek); - - await context.Response.WriteAsync("Hello World"); - - Assert.True(context.Response.HasStarted); - Assert.False(context.Response.Body.CanSeek); - }); - }); - var server = new TestServer(builder); - - var response = await server.CreateClient().GetAsync(""); - response.EnsureSuccessStatusCode(); - Assert.Equal("Hello World", await response.Content.ReadAsStringAsync()); - IEnumerable values; - Assert.False(response.Content.Headers.TryGetValues("Content-Length", out values)); - } - } -} diff --git a/test/Microsoft.AspNetCore.HostFiltering.Tests/Microsoft.AspNetCore.HostFiltering.Tests.csproj b/test/Microsoft.AspNetCore.HostFiltering.Tests/Microsoft.AspNetCore.HostFiltering.Tests.csproj deleted file mode 100644 index 407ecdef0f..0000000000 --- a/test/Microsoft.AspNetCore.HostFiltering.Tests/Microsoft.AspNetCore.HostFiltering.Tests.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj deleted file mode 100644 index dc9bc780b0..0000000000 --- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.HttpsPolicy.Tests/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj b/test/Microsoft.AspNetCore.HttpsPolicy.Tests/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj deleted file mode 100644 index 9117246de5..0000000000 --- a/test/Microsoft.AspNetCore.HttpsPolicy.Tests/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp2.2 - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj deleted file mode 100644 index b979c66a00..0000000000 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - diff --git a/version.props b/version.props deleted file mode 100644 index 3cba6cd9d8..0000000000 --- a/version.props +++ /dev/null @@ -1,18 +0,0 @@ - - - 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - 0.6.0 - alpha1 - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final - $(ExperimentalVersionSuffix)-$(BuildNumber) - -