diff --git a/build/artifacts.props b/build/artifacts.props index a302e6472e..82149d61bd 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -148,7 +148,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 60ed7c44db..512cca0827 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,13 +8,9 @@ - - - - diff --git a/build/repo.props b/build/repo.props index 0b83de0f1f..6d0bae2aaf 100644 --- a/build/repo.props +++ b/build/repo.props @@ -68,9 +68,12 @@ $(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj " /> + + $(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths $(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts + $(RestoreDependsOn);RestoreNpm $(RestoreDependsOn);InstallDotNet;RestoreProjects $(CompileDependsOn);BuildProjects;PackSharedSources $(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx @@ -34,6 +35,17 @@ $(CodeSignDependsOn);RemoveSharedFrameworkOnlyRefsFromNuspec + + + + + install --no-optional + ci + + + + + diff --git a/build/submodules.props b/build/submodules.props index bffb2ef118..b0e3257431 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -37,21 +37,17 @@ - - - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index a826c49d88..4c1e38844d 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -4,6 +4,17 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 2.2.0 + + + 2.2.0 + + + + + + + + 2.2.0 @@ -30,6 +41,17 @@ + + + 2.2.0 + + + + + + + + 2.2.0 @@ -314,6 +336,24 @@ + + + 2.2.0 + + + + + + + 2.2.0 + + + + + + + + 2.2.0 @@ -469,6 +509,17 @@ + + + 2.2.0 + + + + + + + + 2.2.0 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 215d8a4170..d88dbac121 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -3,9 +3,11 @@ + + @@ -37,6 +39,8 @@ + + @@ -48,6 +52,7 @@ + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 6c24b72cae..29f0b9978d 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -18,6 +18,7 @@ + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index c98a2fe57e..a62827520f 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -1,6 +1,7 @@ + @@ -58,5 +59,9 @@ + + + + diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props index fa03a64a8f..2f48702aac 100644 --- a/eng/dependencies.temp.props +++ b/eng/dependencies.temp.props @@ -1,10 +1,9 @@ - diff --git a/src/Antiforgery/.gitignore b/src/Antiforgery/.gitignore deleted file mode 100644 index 6da3c6a3e9..0000000000 --- a/src/Antiforgery/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -bower_components/ -node_modules/ -**/wwwroot/lib/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -**/[Cc]ompiler/[Rr]esources/**/*.js -*launchSettings.json -.build/ -.testPublish/ -global.json diff --git a/src/Antiforgery/Antiforgery.sln b/src/Antiforgery/Antiforgery.sln index a4f13419cd..b4e5774f08 100644 --- a/src/Antiforgery/Antiforgery.sln +++ b/src/Antiforgery/Antiforgery.sln @@ -6,9 +6,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71D070C4-B32 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EDD8B57-4DE8-4246-A6A3-47ECD92740B4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "src\Microsoft.AspNetCore.Antiforgery\Microsoft.AspNetCore.Antiforgery.csproj", "{46FB03FB-7A44-4106-BDDE-D6F5417544AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "src\Microsoft.AspNetCore.Antiforgery.csproj", "{46FB03FB-7A44-4106-BDDE-D6F5417544AB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery.Test", "test\Microsoft.AspNetCore.Antiforgery.Test\Microsoft.AspNetCore.Antiforgery.Test.csproj", "{415E83F8-6002-47E4-AA8E-CD5169C06F28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery.Test", "test\Microsoft.AspNetCore.Antiforgery.Test.csproj", "{415E83F8-6002-47E4-AA8E-CD5169C06F28}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Antiforgery/Directory.Build.props b/src/Antiforgery/Directory.Build.props deleted file mode 100644 index 8513a089cf..0000000000 --- a/src/Antiforgery/Directory.Build.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - - - - - - diff --git a/src/Antiforgery/Directory.Build.targets b/src/Antiforgery/Directory.Build.targets deleted file mode 100644 index 7a09b207eb..0000000000 --- a/src/Antiforgery/Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - $(MicrosoftNETCoreAppPackageVersion) - - diff --git a/src/Antiforgery/NuGetPackageVerifier.json b/src/Antiforgery/NuGetPackageVerifier.json deleted file mode 100644 index b153ab1515..0000000000 --- a/src/Antiforgery/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/Antiforgery/build/Key.snk b/src/Antiforgery/build/Key.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/src/Antiforgery/build/Key.snk and /dev/null differ diff --git a/src/Antiforgery/build/dependencies.props b/src/Antiforgery/build/dependencies.props deleted file mode 100644 index bcc1e4c9b5..0000000000 --- a/src/Antiforgery/build/dependencies.props +++ /dev/null @@ -1,26 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 3.0.0-alpha1-20180919.1 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-preview1-26907-05 - 15.6.1 - 4.9.0 - 2.3.1 - 2.4.0 - - - - diff --git a/src/Antiforgery/build/repo.props b/src/Antiforgery/build/repo.props deleted file mode 100644 index e3e0fa123b..0000000000 --- a/src/Antiforgery/build/repo.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Antiforgery/build/sources.props b/src/Antiforgery/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/Antiforgery/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/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptions.cs b/src/Antiforgery/src/AntiforgeryOptions.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptions.cs rename to src/Antiforgery/src/AntiforgeryOptions.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryServiceCollectionExtensions.cs b/src/Antiforgery/src/AntiforgeryServiceCollectionExtensions.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryServiceCollectionExtensions.cs rename to src/Antiforgery/src/AntiforgeryServiceCollectionExtensions.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryTokenSet.cs b/src/Antiforgery/src/AntiforgeryTokenSet.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryTokenSet.cs rename to src/Antiforgery/src/AntiforgeryTokenSet.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryValidationException.cs b/src/Antiforgery/src/AntiforgeryValidationException.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryValidationException.cs rename to src/Antiforgery/src/AntiforgeryValidationException.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/IAntiforgery.cs b/src/Antiforgery/src/IAntiforgery.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/IAntiforgery.cs rename to src/Antiforgery/src/IAntiforgery.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryAdditionalDataProvider.cs b/src/Antiforgery/src/IAntiforgeryAdditionalDataProvider.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryAdditionalDataProvider.cs rename to src/Antiforgery/src/IAntiforgeryAdditionalDataProvider.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryFeature.cs b/src/Antiforgery/src/Internal/AntiforgeryFeature.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryFeature.cs rename to src/Antiforgery/src/Internal/AntiforgeryFeature.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryLoggerExtensions.cs b/src/Antiforgery/src/Internal/AntiforgeryLoggerExtensions.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryLoggerExtensions.cs rename to src/Antiforgery/src/Internal/AntiforgeryLoggerExtensions.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryOptionsSetup.cs b/src/Antiforgery/src/Internal/AntiforgeryOptionsSetup.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryOptionsSetup.cs rename to src/Antiforgery/src/Internal/AntiforgeryOptionsSetup.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContext.cs b/src/Antiforgery/src/Internal/AntiforgerySerializationContext.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContext.cs rename to src/Antiforgery/src/Internal/AntiforgerySerializationContext.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContextPooledObjectPolicy.cs b/src/Antiforgery/src/Internal/AntiforgerySerializationContextPooledObjectPolicy.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContextPooledObjectPolicy.cs rename to src/Antiforgery/src/Internal/AntiforgerySerializationContextPooledObjectPolicy.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryToken.cs b/src/Antiforgery/src/Internal/AntiforgeryToken.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryToken.cs rename to src/Antiforgery/src/Internal/AntiforgeryToken.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/BinaryBlob.cs b/src/Antiforgery/src/Internal/BinaryBlob.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/BinaryBlob.cs rename to src/Antiforgery/src/Internal/BinaryBlob.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/CryptographyAlgorithms.cs b/src/Antiforgery/src/Internal/CryptographyAlgorithms.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/CryptographyAlgorithms.cs rename to src/Antiforgery/src/Internal/CryptographyAlgorithms.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgery.cs b/src/Antiforgery/src/Internal/DefaultAntiforgery.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgery.cs rename to src/Antiforgery/src/Internal/DefaultAntiforgery.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryAdditionalDataProvider.cs b/src/Antiforgery/src/Internal/DefaultAntiforgeryAdditionalDataProvider.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryAdditionalDataProvider.cs rename to src/Antiforgery/src/Internal/DefaultAntiforgeryAdditionalDataProvider.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenGenerator.cs b/src/Antiforgery/src/Internal/DefaultAntiforgeryTokenGenerator.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenGenerator.cs rename to src/Antiforgery/src/Internal/DefaultAntiforgeryTokenGenerator.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenSerializer.cs b/src/Antiforgery/src/Internal/DefaultAntiforgeryTokenSerializer.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenSerializer.cs rename to src/Antiforgery/src/Internal/DefaultAntiforgeryTokenSerializer.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenStore.cs b/src/Antiforgery/src/Internal/DefaultAntiforgeryTokenStore.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenStore.cs rename to src/Antiforgery/src/Internal/DefaultAntiforgeryTokenStore.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultClaimUidExtractor.cs b/src/Antiforgery/src/Internal/DefaultClaimUidExtractor.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultClaimUidExtractor.cs rename to src/Antiforgery/src/Internal/DefaultClaimUidExtractor.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryFeature.cs b/src/Antiforgery/src/Internal/IAntiforgeryFeature.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryFeature.cs rename to src/Antiforgery/src/Internal/IAntiforgeryFeature.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenGenerator.cs b/src/Antiforgery/src/Internal/IAntiforgeryTokenGenerator.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenGenerator.cs rename to src/Antiforgery/src/Internal/IAntiforgeryTokenGenerator.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenSerializer.cs b/src/Antiforgery/src/Internal/IAntiforgeryTokenSerializer.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenSerializer.cs rename to src/Antiforgery/src/Internal/IAntiforgeryTokenSerializer.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenStore.cs b/src/Antiforgery/src/Internal/IAntiforgeryTokenStore.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenStore.cs rename to src/Antiforgery/src/Internal/IAntiforgeryTokenStore.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IClaimUidExtractor.cs b/src/Antiforgery/src/Internal/IClaimUidExtractor.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Internal/IClaimUidExtractor.cs rename to src/Antiforgery/src/Internal/IClaimUidExtractor.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj new file mode 100644 index 0000000000..a157b130cc --- /dev/null +++ b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj @@ -0,0 +1,19 @@ + + + + An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks. + netcoreapp3.0 + $(NoWarn);CS1591 + true + aspnetcore;antiforgery + + + + + + + + + + + diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj deleted file mode 100644 index 621e2628fd..0000000000 --- a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks. - netcoreapp3.0 - $(NoWarn);CS1591 - true - aspnetcore;antiforgery - - - - - - - - - - - diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs b/src/Antiforgery/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs rename to src/Antiforgery/src/Properties/AssemblyInfo.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Properties/Resources.Designer.cs b/src/Antiforgery/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Properties/Resources.Designer.cs rename to src/Antiforgery/src/Properties/Resources.Designer.cs diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Resources.resx b/src/Antiforgery/src/Resources.resx similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/Resources.resx rename to src/Antiforgery/src/Resources.resx diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json b/src/Antiforgery/src/baseline.netcore.json similarity index 100% rename from src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery/baseline.netcore.json rename to src/Antiforgery/src/baseline.netcore.json diff --git a/src/Antiforgery/test/Directory.Build.props b/src/Antiforgery/test/Directory.Build.props deleted file mode 100644 index 05002e1cac..0000000000 --- a/src/Antiforgery/test/Directory.Build.props +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryOptionsSetupTest.cs b/src/Antiforgery/test/Internal/AntiforgeryOptionsSetupTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryOptionsSetupTest.cs rename to src/Antiforgery/test/Internal/AntiforgeryOptionsSetupTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryTokenTest.cs b/src/Antiforgery/test/Internal/AntiforgeryTokenTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryTokenTest.cs rename to src/Antiforgery/test/Internal/AntiforgeryTokenTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/BinaryBlobTest.cs b/src/Antiforgery/test/Internal/BinaryBlobTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/BinaryBlobTest.cs rename to src/Antiforgery/test/Internal/BinaryBlobTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTest.cs b/src/Antiforgery/test/Internal/DefaultAntiforgeryTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTest.cs rename to src/Antiforgery/test/Internal/DefaultAntiforgeryTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs b/src/Antiforgery/test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs rename to src/Antiforgery/test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenSerializerTest.cs b/src/Antiforgery/test/Internal/DefaultAntiforgeryTokenSerializerTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenSerializerTest.cs rename to src/Antiforgery/test/Internal/DefaultAntiforgeryTokenSerializerTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs b/src/Antiforgery/test/Internal/DefaultAntiforgeryTokenStoreTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs rename to src/Antiforgery/test/Internal/DefaultAntiforgeryTokenStoreTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs b/src/Antiforgery/test/Internal/DefaultClaimUidExtractorTest.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs rename to src/Antiforgery/test/Internal/DefaultClaimUidExtractorTest.cs diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj b/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj new file mode 100644 index 0000000000..ea34bc929f --- /dev/null +++ b/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj b/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj deleted file mode 100644 index 685d5bea49..0000000000 --- a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - - - - - - - - - diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/TestOptionsManager.cs b/src/Antiforgery/test/TestOptionsManager.cs similarity index 100% rename from src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test/TestOptionsManager.cs rename to src/Antiforgery/test/TestOptionsManager.cs diff --git a/src/Antiforgery/version.props b/src/Antiforgery/version.props deleted file mode 100644 index 71a78cddd8..0000000000 --- a/src/Antiforgery/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/CORS/.gitignore b/src/CORS/.gitignore deleted file mode 100644 index a435689c0a..0000000000 --- a/src/CORS/.gitignore +++ /dev/null @@ -1,41 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -bower_components/ -node_modules/ -**/wwwroot/lib/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -**/[Cc]ompiler/[Rr]esources/**/*.js -*launchSettings.json -.build/ -.testPublish/ -.vscode -global.json diff --git a/src/CORS/CORS.sln b/src/CORS/CORS.sln deleted file mode 100644 index 6ad6179b3f..0000000000 --- a/src/CORS/CORS.sln +++ /dev/null @@ -1,96 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26817.0 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{84FE6872-A610-4CEC-855F-A84CBF1F40FC}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F32074C7-087C-46CC-A913-422BFD2D6E0A}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "src\Microsoft.AspNetCore.Cors\Microsoft.AspNetCore.Cors.csproj", "{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors.Test", "test\Microsoft.AspNetCore.Cors.Test\Microsoft.AspNetCore.Cors.Test.csproj", "{F05BE96F-F869-4408-A480-96935B4835EE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{538380BF-0D4C-4E30-8F41-E75C4B1C01FA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsMiddlewareWebSite", "test\WebSites\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj", "{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{960E0703-A8A5-44DF-AA87-B7C614683B3C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleDestination", "samples\SampleDestination\SampleDestination.csproj", "{F6675DC1-AA21-453B-89B6-DA425FB9C3A5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleOrigin", "samples\SampleOrigin\SampleOrigin.csproj", "{99460370-AE5D-4DC9-8DBF-04DF66D6B21D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0CCC5C1B-F548-4A17-96F8-14C700093FA0}" - 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}") = "FunctionalTests", "test\FunctionalTests\FunctionalTests.csproj", "{99EB6889-C7D8-4BC3-AF99-B966B9E64C81}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Release|Any CPU.Build.0 = Release|Any CPU - {F05BE96F-F869-4408-A480-96935B4835EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F05BE96F-F869-4408-A480-96935B4835EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F05BE96F-F869-4408-A480-96935B4835EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F05BE96F-F869-4408-A480-96935B4835EE}.Release|Any CPU.Build.0 = Release|Any CPU - {B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Release|Any CPU.Build.0 = Release|Any CPU - {F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Release|Any CPU.Build.0 = Release|Any CPU - {99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Release|Any CPU.Build.0 = Release|Any CPU - {99EB6889-C7D8-4BC3-AF99-B966B9E64C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99EB6889-C7D8-4BC3-AF99-B966B9E64C81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99EB6889-C7D8-4BC3-AF99-B966B9E64C81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99EB6889-C7D8-4BC3-AF99-B966B9E64C81}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {41349FCD-D1C4-47A6-82D0-D16D00A8D59D} = {84FE6872-A610-4CEC-855F-A84CBF1F40FC} - {F05BE96F-F869-4408-A480-96935B4835EE} = {F32074C7-087C-46CC-A913-422BFD2D6E0A} - {538380BF-0D4C-4E30-8F41-E75C4B1C01FA} = {F32074C7-087C-46CC-A913-422BFD2D6E0A} - {B42D4844-FFF8-4EC2-88D1-3AE95234D9EB} = {538380BF-0D4C-4E30-8F41-E75C4B1C01FA} - {F6675DC1-AA21-453B-89B6-DA425FB9C3A5} = {960E0703-A8A5-44DF-AA87-B7C614683B3C} - {99460370-AE5D-4DC9-8DBF-04DF66D6B21D} = {960E0703-A8A5-44DF-AA87-B7C614683B3C} - {99EB6889-C7D8-4BC3-AF99-B966B9E64C81} = {F32074C7-087C-46CC-A913-422BFD2D6E0A} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F9ED9C53-44CD-4853-9621-D028B7B6A431} - EndGlobalSection -EndGlobal diff --git a/src/CORS/Directory.Build.props b/src/CORS/Directory.Build.props deleted file mode 100644 index cd0187875b..0000000000 --- a/src/CORS/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - - - diff --git a/src/CORS/Directory.Build.targets b/src/CORS/Directory.Build.targets deleted file mode 100644 index 7a09b207eb..0000000000 --- a/src/CORS/Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - $(MicrosoftNETCoreAppPackageVersion) - - diff --git a/src/CORS/NuGetPackageVerifier.json b/src/CORS/NuGetPackageVerifier.json deleted file mode 100644 index b153ab1515..0000000000 --- a/src/CORS/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/CORS/README.md b/src/CORS/README.md deleted file mode 100644 index e27272608e..0000000000 --- a/src/CORS/README.md +++ /dev/null @@ -1,8 +0,0 @@ -CORS [Archived] -=============== - -**This GitHub project has been archived.** Ongoing development on this project can be found in . - -CORS repository includes the core implementation for CORS policy, utilized by the CORS middleware and MVC. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [AspNetCore](https://github.com/aspnet/AspNetCore) repo. diff --git a/src/CORS/build/Key.snk b/src/CORS/build/Key.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/src/CORS/build/Key.snk and /dev/null differ diff --git a/src/CORS/build/buildpipeline/linux.groovy b/src/CORS/build/buildpipeline/linux.groovy deleted file mode 100644 index 791d923d0c..0000000000 --- a/src/CORS/build/buildpipeline/linux.groovy +++ /dev/null @@ -1 +0,0 @@ -@Library('dotnet-ci') _ diff --git a/src/CORS/build/buildpipeline/osx.groovy b/src/CORS/build/buildpipeline/osx.groovy deleted file mode 100644 index 791d923d0c..0000000000 --- a/src/CORS/build/buildpipeline/osx.groovy +++ /dev/null @@ -1 +0,0 @@ -@Library('dotnet-ci') _ diff --git a/src/CORS/build/buildpipeline/pipeline.groovy b/src/CORS/build/buildpipeline/pipeline.groovy deleted file mode 100644 index e915cadae1..0000000000 --- a/src/CORS/build/buildpipeline/pipeline.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') -def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy') -def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy') -String configuration = 'Release' -def parameters = [ - 'Configuration': configuration -] - -windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters) -windowsPipeline.triggerPipelineOnGithubPush(parameters) - -linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters) -linuxPipeline.triggerPipelineOnGithubPush(parameters) - -osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters) -osxPipeline.triggerPipelineOnGithubPush(parameters) diff --git a/src/CORS/build/buildpipeline/windows.groovy b/src/CORS/build/buildpipeline/windows.groovy deleted file mode 100644 index 26f49c395d..0000000000 --- a/src/CORS/build/buildpipeline/windows.groovy +++ /dev/null @@ -1,12 +0,0 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - bat '.\\run.cmd -CI default-build' - } -} diff --git a/src/CORS/build/dependencies.props b/src/CORS/build/dependencies.props deleted file mode 100644 index 852459d65d..0000000000 --- a/src/CORS/build/dependencies.props +++ /dev/null @@ -1,28 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 3.0.0-build-20181116.1 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 0.7.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-preview-181113-11 - 3.0.0-preview-181113-11 - 3.0.0-preview-181113-11 - 3.0.0-preview-181113-11 - 3.0.0-preview-181113-11 - 3.0.0-preview-181113-11 - 3.0.0-preview1-26907-05 - 15.6.1 - 4.10.0 - 0.10.0 - 2.3.1 - 2.4.0 - - - - diff --git a/src/CORS/build/repo.props b/src/CORS/build/repo.props deleted file mode 100644 index 00a0c65cc2..0000000000 --- a/src/CORS/build/repo.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/CORS/build/repo.targets b/src/CORS/build/repo.targets deleted file mode 100644 index e2057ccf22..0000000000 --- a/src/CORS/build/repo.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - $(RestoreDependsOn);RestoreNpm - - - - - - - - diff --git a/src/CORS/build/sources.props b/src/CORS/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/CORS/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/src/CORS/samples/README.md b/src/CORS/samples/README.md deleted file mode 100644 index 0224188d71..0000000000 --- a/src/CORS/samples/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# CORS Sample - -This sample consists of a request origin (SampleOrigin) and a request destination (SampleDestination). Both have different domain names, to simulate a CORS request. - -## Modify Hosts File -To run this CORS sample, modify the hosts file to register the hostnames `destination.example.com` and `origin.example.com`. -### Windows: -Run a text editor (e.g. Notepad) as an Administrator. Open the hosts file on the path: "C:\Windows\System32\drivers\etc\hosts". - -### Linux: -On a Terminal window, type "sudo nano /etc/hosts" and enter your admin password when prompted. - -In the hosts file, add the following to the bottom of the file: - -``` -127.0.0.1 destination.example.com -127.0.0.1 origin.example.com -``` - -Save the file and close it. Then clear your browser history. - -## Run the sample -The SampleOrigin application will use port 5001, and SampleDestination will use 5000. Please ensure there are no other processes using those ports before running the CORS sample. - -* In a command prompt window, open the directory where you cloned the repository, and open the SampleDestination directory. Run the command: dotnet run -* Repeat the above step in the SampleOrigin directory -* Open a browser window and go to `http://origin.example.com:5001` -* Input a method and header to create a CORS request or use one of the example buttons to see CORS in action - -As an example, apart from `GET`, `HEAD` and `POST` requests, `PUT` requests are allowed in the CORS policy on SampleDestination. Any others, like `DELETE`, `OPTIONS` etc. are not allowed and throw an error. -`Cache-Control` has been added as an allowed header to the sample. Any other headers are not allowed and throw an error. You may leave the header name and value blank. - -To edit the policy, please see `app.UseCors()` method in the `Startup.cs` file of SampleDestination. - -**If using Visual Studio to launch the request origin:** -Open Visual Studio and in the `launchSettings.json` file for the SampleOrigin project, change the `launchUrl` under SampleOrigin to `http://origin.example.com:5001`. -Using the dropdown near the Start button, choose SampleOrigin before pressing Start to ensure that it uses Kestrel and not IIS Express. - diff --git a/src/CORS/samples/SampleDestination/SampleDestination.csproj b/src/CORS/samples/SampleDestination/SampleDestination.csproj deleted file mode 100644 index 5094c37c80..0000000000 --- a/src/CORS/samples/SampleDestination/SampleDestination.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - diff --git a/src/CORS/samples/SampleOrigin/SampleOrigin.csproj b/src/CORS/samples/SampleOrigin/SampleOrigin.csproj deleted file mode 100644 index f6debf7624..0000000000 --- a/src/CORS/samples/SampleOrigin/SampleOrigin.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - PreserveNewest - - - - diff --git a/src/CORS/src/Directory.Build.props b/src/CORS/src/Directory.Build.props deleted file mode 100644 index 4f07cbc45d..0000000000 --- a/src/CORS/src/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj b/src/CORS/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj deleted file mode 100644 index 10b5ecbaa9..0000000000 --- a/src/CORS/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - CORS middleware and policy for ASP.NET Core to enable cross-origin resource sharing. -Commonly used types: -Microsoft.AspNetCore.Cors.DisableCorsAttribute -Microsoft.AspNetCore.Cors.EnableCorsAttribute - netcoreapp3.0 - $(NoWarn);CS1591 - true - aspnetcore;cors - - - - - - - - - - - diff --git a/src/CORS/test/Directory.Build.props b/src/CORS/test/Directory.Build.props deleted file mode 100644 index 4f07cbc45d..0000000000 --- a/src/CORS/test/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj b/src/CORS/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj deleted file mode 100644 index ffbd24df79..0000000000 --- a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - - - - - - - diff --git a/src/CORS/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj b/src/CORS/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj deleted file mode 100644 index b3ff0764eb..0000000000 --- a/src/CORS/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - diff --git a/src/CORS/version.props b/src/CORS/version.props deleted file mode 100644 index 71a78cddd8..0000000000 --- a/src/CORS/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index 3c72060591..ac22e5fe84 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/CORS/samples/SampleDestination/Program.cs b/src/Middleware/CORS/samples/SampleDestination/Program.cs similarity index 100% rename from src/CORS/samples/SampleDestination/Program.cs rename to src/Middleware/CORS/samples/SampleDestination/Program.cs diff --git a/src/Middleware/CORS/samples/SampleDestination/SampleDestination.csproj b/src/Middleware/CORS/samples/SampleDestination/SampleDestination.csproj new file mode 100644 index 0000000000..bf841bc00b --- /dev/null +++ b/src/Middleware/CORS/samples/SampleDestination/SampleDestination.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/src/CORS/samples/SampleDestination/SampleMiddleware.cs b/src/Middleware/CORS/samples/SampleDestination/SampleMiddleware.cs similarity index 100% rename from src/CORS/samples/SampleDestination/SampleMiddleware.cs rename to src/Middleware/CORS/samples/SampleDestination/SampleMiddleware.cs diff --git a/src/CORS/samples/SampleDestination/Startup.cs b/src/Middleware/CORS/samples/SampleDestination/Startup.cs similarity index 100% rename from src/CORS/samples/SampleDestination/Startup.cs rename to src/Middleware/CORS/samples/SampleDestination/Startup.cs diff --git a/src/CORS/samples/SampleOrigin/Program.cs b/src/Middleware/CORS/samples/SampleOrigin/Program.cs similarity index 100% rename from src/CORS/samples/SampleOrigin/Program.cs rename to src/Middleware/CORS/samples/SampleOrigin/Program.cs diff --git a/src/Middleware/CORS/samples/SampleOrigin/SampleOrigin.csproj b/src/Middleware/CORS/samples/SampleOrigin/SampleOrigin.csproj new file mode 100644 index 0000000000..94b56d727e --- /dev/null +++ b/src/Middleware/CORS/samples/SampleOrigin/SampleOrigin.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/src/CORS/samples/SampleOrigin/Startup.cs b/src/Middleware/CORS/samples/SampleOrigin/Startup.cs similarity index 100% rename from src/CORS/samples/SampleOrigin/Startup.cs rename to src/Middleware/CORS/samples/SampleOrigin/Startup.cs diff --git a/src/CORS/samples/SampleOrigin/wwwroot/index.htm b/src/Middleware/CORS/samples/SampleOrigin/wwwroot/index.htm similarity index 100% rename from src/CORS/samples/SampleOrigin/wwwroot/index.htm rename to src/Middleware/CORS/samples/SampleOrigin/wwwroot/index.htm diff --git a/src/CORS/samples/SampleOrigin/wwwroot/test.htm b/src/Middleware/CORS/samples/SampleOrigin/wwwroot/test.htm similarity index 100% rename from src/CORS/samples/SampleOrigin/wwwroot/test.htm rename to src/Middleware/CORS/samples/SampleOrigin/wwwroot/test.htm diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs b/src/Middleware/CORS/src/CorsServiceCollectionExtensions.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs rename to src/Middleware/CORS/src/CorsServiceCollectionExtensions.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/DisableCorsAttribute.cs b/src/Middleware/CORS/src/DisableCorsAttribute.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/DisableCorsAttribute.cs rename to src/Middleware/CORS/src/DisableCorsAttribute.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/EnableCorsAttribute.cs b/src/Middleware/CORS/src/EnableCorsAttribute.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/EnableCorsAttribute.cs rename to src/Middleware/CORS/src/EnableCorsAttribute.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsConstants.cs b/src/Middleware/CORS/src/Infrastructure/CorsConstants.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsConstants.cs rename to src/Middleware/CORS/src/Infrastructure/CorsConstants.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddleware.cs b/src/Middleware/CORS/src/Infrastructure/CorsMiddleware.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddleware.cs rename to src/Middleware/CORS/src/Infrastructure/CorsMiddleware.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddlewareExtensions.cs b/src/Middleware/CORS/src/Infrastructure/CorsMiddlewareExtensions.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddlewareExtensions.cs rename to src/Middleware/CORS/src/Infrastructure/CorsMiddlewareExtensions.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsOptions.cs b/src/Middleware/CORS/src/Infrastructure/CorsOptions.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsOptions.cs rename to src/Middleware/CORS/src/Infrastructure/CorsOptions.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicy.cs b/src/Middleware/CORS/src/Infrastructure/CorsPolicy.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicy.cs rename to src/Middleware/CORS/src/Infrastructure/CorsPolicy.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicyBuilder.cs b/src/Middleware/CORS/src/Infrastructure/CorsPolicyBuilder.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicyBuilder.cs rename to src/Middleware/CORS/src/Infrastructure/CorsPolicyBuilder.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicyExtensions.cs b/src/Middleware/CORS/src/Infrastructure/CorsPolicyExtensions.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicyExtensions.cs rename to src/Middleware/CORS/src/Infrastructure/CorsPolicyExtensions.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsResult.cs b/src/Middleware/CORS/src/Infrastructure/CorsResult.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsResult.cs rename to src/Middleware/CORS/src/Infrastructure/CorsResult.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsService.cs b/src/Middleware/CORS/src/Infrastructure/CorsService.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsService.cs rename to src/Middleware/CORS/src/Infrastructure/CorsService.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/DefaultCorsPolicyProvider.cs b/src/Middleware/CORS/src/Infrastructure/DefaultCorsPolicyProvider.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/DefaultCorsPolicyProvider.cs rename to src/Middleware/CORS/src/Infrastructure/DefaultCorsPolicyProvider.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsPolicyProvider.cs b/src/Middleware/CORS/src/Infrastructure/ICorsPolicyProvider.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsPolicyProvider.cs rename to src/Middleware/CORS/src/Infrastructure/ICorsPolicyProvider.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsService.cs b/src/Middleware/CORS/src/Infrastructure/ICorsService.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsService.cs rename to src/Middleware/CORS/src/Infrastructure/ICorsService.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/IDisableCorsAttribute.cs b/src/Middleware/CORS/src/Infrastructure/IDisableCorsAttribute.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/IDisableCorsAttribute.cs rename to src/Middleware/CORS/src/Infrastructure/IDisableCorsAttribute.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/IEnableCorsAttribute.cs b/src/Middleware/CORS/src/Infrastructure/IEnableCorsAttribute.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/IEnableCorsAttribute.cs rename to src/Middleware/CORS/src/Infrastructure/IEnableCorsAttribute.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/UriHelpers.cs b/src/Middleware/CORS/src/Infrastructure/UriHelpers.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Infrastructure/UriHelpers.cs rename to src/Middleware/CORS/src/Infrastructure/UriHelpers.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs b/src/Middleware/CORS/src/Internal/CORSLoggerExtensions.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs rename to src/Middleware/CORS/src/Internal/CORSLoggerExtensions.cs diff --git a/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj b/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj new file mode 100644 index 0000000000..441e1c5ba6 --- /dev/null +++ b/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj @@ -0,0 +1,22 @@ + + + + CORS middleware and policy for ASP.NET Core to enable cross-origin resource sharing. +Commonly used types: +Microsoft.AspNetCore.Cors.DisableCorsAttribute +Microsoft.AspNetCore.Cors.EnableCorsAttribute + netcoreapp3.0 + $(NoWarn);CS1591 + true + aspnetcore;cors + + + + + + + + + + + diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Properties/AssemblyInfo.cs b/src/Middleware/CORS/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Properties/AssemblyInfo.cs rename to src/Middleware/CORS/src/Properties/AssemblyInfo.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Resources.Designer.cs b/src/Middleware/CORS/src/Resources.Designer.cs similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Resources.Designer.cs rename to src/Middleware/CORS/src/Resources.Designer.cs diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/Resources.resx b/src/Middleware/CORS/src/Resources.resx similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/Resources.resx rename to src/Middleware/CORS/src/Resources.resx diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/baseline.netcore.json b/src/Middleware/CORS/src/baseline.netcore.json similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/baseline.netcore.json rename to src/Middleware/CORS/src/baseline.netcore.json diff --git a/src/CORS/src/Microsoft.AspNetCore.Cors/breakingchanges.netcore.json b/src/Middleware/CORS/src/breakingchanges.netcore.json similarity index 100% rename from src/CORS/src/Microsoft.AspNetCore.Cors/breakingchanges.netcore.json rename to src/Middleware/CORS/src/breakingchanges.netcore.json diff --git a/src/CORS/test/FunctionalTests/Assert.cs b/src/Middleware/CORS/test/FunctionalTests/Assert.cs similarity index 100% rename from src/CORS/test/FunctionalTests/Assert.cs rename to src/Middleware/CORS/test/FunctionalTests/Assert.cs diff --git a/src/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs similarity index 100% rename from src/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs rename to src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs diff --git a/src/CORS/test/FunctionalTests/FunctionalTests.csproj b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj similarity index 50% rename from src/CORS/test/FunctionalTests/FunctionalTests.csproj rename to src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj index 8908f23b84..ccfe0afd2b 100644 --- a/src/CORS/test/FunctionalTests/FunctionalTests.csproj +++ b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj @@ -17,12 +17,8 @@ - - - - - - + + diff --git a/src/CORS/test/FunctionalTests/ProcessManager.cs b/src/Middleware/CORS/test/FunctionalTests/ProcessManager.cs similarity index 100% rename from src/CORS/test/FunctionalTests/ProcessManager.cs rename to src/Middleware/CORS/test/FunctionalTests/ProcessManager.cs diff --git a/src/CORS/test/FunctionalTests/ProcessResult.cs b/src/Middleware/CORS/test/FunctionalTests/ProcessResult.cs similarity index 100% rename from src/CORS/test/FunctionalTests/ProcessResult.cs rename to src/Middleware/CORS/test/FunctionalTests/ProcessResult.cs diff --git a/src/CORS/test/FunctionalTests/package-lock.json b/src/Middleware/CORS/test/FunctionalTests/package-lock.json similarity index 100% rename from src/CORS/test/FunctionalTests/package-lock.json rename to src/Middleware/CORS/test/FunctionalTests/package-lock.json diff --git a/src/CORS/test/FunctionalTests/package.json b/src/Middleware/CORS/test/FunctionalTests/package.json similarity index 100% rename from src/CORS/test/FunctionalTests/package.json rename to src/Middleware/CORS/test/FunctionalTests/package.json diff --git a/src/CORS/test/FunctionalTests/test.js b/src/Middleware/CORS/test/FunctionalTests/test.js similarity index 100% rename from src/CORS/test/FunctionalTests/test.js rename to src/Middleware/CORS/test/FunctionalTests/test.js diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareTests.cs b/src/Middleware/CORS/test/Test/CorsMiddlewareTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareTests.cs rename to src/Middleware/CORS/test/Test/CorsMiddlewareTests.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsOptionsTest.cs b/src/Middleware/CORS/test/Test/CorsOptionsTest.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsOptionsTest.cs rename to src/Middleware/CORS/test/Test/CorsOptionsTest.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyBuilderTests.cs b/src/Middleware/CORS/test/Test/CorsPolicyBuilderTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyBuilderTests.cs rename to src/Middleware/CORS/test/Test/CorsPolicyBuilderTests.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyExtensionsTests.cs b/src/Middleware/CORS/test/Test/CorsPolicyExtensionsTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyExtensionsTests.cs rename to src/Middleware/CORS/test/Test/CorsPolicyExtensionsTests.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyTests.cs b/src/Middleware/CORS/test/Test/CorsPolicyTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyTests.cs rename to src/Middleware/CORS/test/Test/CorsPolicyTests.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsResultTests.cs b/src/Middleware/CORS/test/Test/CorsResultTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsResultTests.cs rename to src/Middleware/CORS/test/Test/CorsResultTests.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs b/src/Middleware/CORS/test/Test/CorsServiceTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs rename to src/Middleware/CORS/test/Test/CorsServiceTests.cs diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/DefaultCorsPolicyProviderTests.cs b/src/Middleware/CORS/test/Test/DefaultCorsPolicyProviderTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/DefaultCorsPolicyProviderTests.cs rename to src/Middleware/CORS/test/Test/DefaultCorsPolicyProviderTests.cs diff --git a/src/Middleware/CORS/test/Test/Microsoft.AspNetCore.Cors.Test.csproj b/src/Middleware/CORS/test/Test/Microsoft.AspNetCore.Cors.Test.csproj new file mode 100644 index 0000000000..2289e8dd9a --- /dev/null +++ b/src/Middleware/CORS/test/Test/Microsoft.AspNetCore.Cors.Test.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + + diff --git a/src/CORS/test/Microsoft.AspNetCore.Cors.Test/UriHelpersTests.cs b/src/Middleware/CORS/test/Test/UriHelpersTests.cs similarity index 100% rename from src/CORS/test/Microsoft.AspNetCore.Cors.Test/UriHelpersTests.cs rename to src/Middleware/CORS/test/Test/UriHelpersTests.cs diff --git a/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj new file mode 100644 index 0000000000..2915256304 --- /dev/null +++ b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/src/CORS/test/WebSites/CorsMiddlewareWebSite/EchoMiddleware.cs b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/EchoMiddleware.cs similarity index 100% rename from src/CORS/test/WebSites/CorsMiddlewareWebSite/EchoMiddleware.cs rename to src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/EchoMiddleware.cs diff --git a/src/CORS/test/WebSites/CorsMiddlewareWebSite/Startup.cs b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/Startup.cs similarity index 100% rename from src/CORS/test/WebSites/CorsMiddlewareWebSite/Startup.cs rename to src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/Startup.cs diff --git a/src/CORS/test/WebSites/CorsMiddlewareWebSite/readme.md b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/readme.md similarity index 100% rename from src/CORS/test/WebSites/CorsMiddlewareWebSite/readme.md rename to src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/readme.md diff --git a/src/CORS/test/WebSites/CorsMiddlewareWebSite/web.config b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/web.config similarity index 100% rename from src/CORS/test/WebSites/CorsMiddlewareWebSite/web.config rename to src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/web.config diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index 34d23ebb3b..447e9ebea0 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -60,6 +60,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8989BEC1-6D0A-4E11-A09C-B31FD6222748}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareAnalysisSample", "MiddlewareAnalysis\samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.csproj", "{18F82832-9164-434E-BAEF-6579B3CFCDF3}" +<<<<<<< HEAD EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj", "{7E00616F-9D5C-4318-99CB-8F6ECFA82515}" EndProject @@ -82,6 +83,12 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore", "HealthChecks.EntityFrameworkCore\src\Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj", "{DA051189-4133-4131-A8B4-0F63EE8552D0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests", "HealthChecks.EntityFrameworkCore\test\Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj", "{7553B6FF-9EA0-4BC2-A720-783685CB2F8D}" +======= +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj", "{7E00616F-9D5C-4318-99CB-8F6ECFA82515}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "MiddlewareAnalysis\test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj", "{009E3DE7-AFC7-4C66-852D-29BF73257176}" +>>>>>>> 4c5debd6ea3a830497f1ad4c3e570466a4f9a2f6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostFiltering", "HostFiltering", "{9298FDED-65F9-4022-A747-FAEC3ADF3AD3}" EndProject @@ -153,6 +160,42 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutobahnTestApp", "WebSockets\test\ConformanceTests\AutobahnTestApp\AutobahnTestApp.csproj", "{A9866990-FDAD-4D58-99EE-3C8730B1F4B1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "CORS\src\Microsoft.AspNetCore.Cors.csproj", "{5140ABCA-53D1-4748-9334-5A9579042E56}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cors", "Cors", "{7CF63806-4C4F-4C48-8922-A75113975308}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors.Test", "CORS\test\Test\Microsoft.AspNetCore.Cors.Test.csproj", "{12AC0566-2B11-433D-81D7-7116C939FAFE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4967DE1B-FEC2-4C2B-8F7F-6262D67C9434}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{BD7B3AD8-0BA6-405F-8CF6-24B9464D4B5B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsMiddlewareWebSite", "CORS\test\testassets\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj", "{D147EB7D-776C-4153-9293-296FCB6568BD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticFiles", "StaticFiles", "{E72E405C-C1DA-41FE-8AF0-49C5E5CB496B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{9FC5644F-21D6-415B-8EBE-D49FA014C934}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticFileSample", "StaticFiles\samples\StaticFileSample\StaticFileSample.csproj", "{85E30300-8205-4E1F-A141-0642CE146B65}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.FunctionalTests", "StaticFiles\test\FunctionalTests\Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj", "{7EE15C68-E49B-4362-A53D-A71193B0A3D1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.Tests", "StaticFiles\test\Tests\Microsoft.AspNetCore.StaticFiles.Tests.csproj", "{112CDD7E-8DEE-407B-A52F-E436CD748F0F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RangeHelper.Sources.Test", "StaticFiles\test\RangeHelper.Sources.Test\Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj", "{E949DA91-9023-4B2A-B16E-F8CFE85F3074}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCaching", "ResponseCaching", "{EDF56413-B406-4200-B4D4-0EE3F9CB8F7C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCaching.Abstractions", "ResponseCaching.Abstractions", "{7A493DEA-32F2-4AB1-9113-828D44F5DDA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{7583CA2C-249C-44A2-8499-8D4C1AB35ADE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseCachingSample", "ResponseCaching\samples\ResponseCachingSample\ResponseCachingSample.csproj", "{D8239A8C-F692-460A-B204-5CF05502BEE2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Tests", "ResponseCaching\test\Microsoft.AspNetCore.ResponseCaching.Tests.csproj", "{9F973483-5D32-4093-88F0-761C9BEAEE04}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{D0204B45-8528-4504-9FC1-D229F3A33896}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -787,6 +830,150 @@ Global {A9866990-FDAD-4D58-99EE-3C8730B1F4B1}.Release|x64.Build.0 = Release|Any CPU {A9866990-FDAD-4D58-99EE-3C8730B1F4B1}.Release|x86.ActiveCfg = Release|Any CPU {A9866990-FDAD-4D58-99EE-3C8730B1F4B1}.Release|x86.Build.0 = Release|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Debug|x64.ActiveCfg = Debug|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Debug|x64.Build.0 = Debug|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Debug|x86.ActiveCfg = Debug|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Debug|x86.Build.0 = Debug|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Release|Any CPU.Build.0 = Release|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Release|x64.ActiveCfg = Release|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Release|x64.Build.0 = Release|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Release|x86.ActiveCfg = Release|Any CPU + {5140ABCA-53D1-4748-9334-5A9579042E56}.Release|x86.Build.0 = Release|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Debug|x64.ActiveCfg = Debug|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Debug|x64.Build.0 = Debug|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Debug|x86.ActiveCfg = Debug|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Debug|x86.Build.0 = Debug|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Release|Any CPU.Build.0 = Release|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Release|x64.ActiveCfg = Release|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Release|x64.Build.0 = Release|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Release|x86.ActiveCfg = Release|Any CPU + {12AC0566-2B11-433D-81D7-7116C939FAFE}.Release|x86.Build.0 = Release|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Debug|x64.ActiveCfg = Debug|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Debug|x64.Build.0 = Debug|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Debug|x86.ActiveCfg = Debug|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Debug|x86.Build.0 = Debug|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Release|Any CPU.Build.0 = Release|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Release|x64.ActiveCfg = Release|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Release|x64.Build.0 = Release|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Release|x86.ActiveCfg = Release|Any CPU + {D147EB7D-776C-4153-9293-296FCB6568BD}.Release|x86.Build.0 = Release|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Debug|x64.ActiveCfg = Debug|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Debug|x64.Build.0 = Debug|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Debug|x86.ActiveCfg = Debug|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Debug|x86.Build.0 = Debug|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Release|Any CPU.Build.0 = Release|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Release|x64.ActiveCfg = Release|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Release|x64.Build.0 = Release|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Release|x86.ActiveCfg = Release|Any CPU + {9FC5644F-21D6-415B-8EBE-D49FA014C934}.Release|x86.Build.0 = Release|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Debug|x64.ActiveCfg = Debug|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Debug|x64.Build.0 = Debug|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Debug|x86.ActiveCfg = Debug|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Debug|x86.Build.0 = Debug|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Release|Any CPU.Build.0 = Release|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Release|x64.ActiveCfg = Release|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Release|x64.Build.0 = Release|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Release|x86.ActiveCfg = Release|Any CPU + {85E30300-8205-4E1F-A141-0642CE146B65}.Release|x86.Build.0 = Release|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Debug|x64.ActiveCfg = Debug|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Debug|x64.Build.0 = Debug|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Debug|x86.ActiveCfg = Debug|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Debug|x86.Build.0 = Debug|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Release|Any CPU.Build.0 = Release|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Release|x64.ActiveCfg = Release|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Release|x64.Build.0 = Release|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Release|x86.ActiveCfg = Release|Any CPU + {7EE15C68-E49B-4362-A53D-A71193B0A3D1}.Release|x86.Build.0 = Release|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Debug|x64.ActiveCfg = Debug|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Debug|x64.Build.0 = Debug|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Debug|x86.ActiveCfg = Debug|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Debug|x86.Build.0 = Debug|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|Any CPU.Build.0 = Release|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x64.ActiveCfg = Release|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x64.Build.0 = Release|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x86.ActiveCfg = Release|Any CPU + {112CDD7E-8DEE-407B-A52F-E436CD748F0F}.Release|x86.Build.0 = Release|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x64.ActiveCfg = Debug|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x64.Build.0 = Debug|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x86.ActiveCfg = Debug|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Debug|x86.Build.0 = Debug|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|Any CPU.Build.0 = Release|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x64.ActiveCfg = Release|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x64.Build.0 = Release|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x86.ActiveCfg = Release|Any CPU + {E949DA91-9023-4B2A-B16E-F8CFE85F3074}.Release|x86.Build.0 = Release|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|x64.ActiveCfg = Debug|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|x64.Build.0 = Debug|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|x86.ActiveCfg = Debug|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Debug|x86.Build.0 = Debug|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Release|Any CPU.Build.0 = Release|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Release|x64.ActiveCfg = Release|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Release|x64.Build.0 = Release|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Release|x86.ActiveCfg = Release|Any CPU + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE}.Release|x86.Build.0 = Release|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Debug|x64.ActiveCfg = Debug|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Debug|x64.Build.0 = Debug|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Debug|x86.ActiveCfg = Debug|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Debug|x86.Build.0 = Debug|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Release|Any CPU.Build.0 = Release|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Release|x64.ActiveCfg = Release|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Release|x64.Build.0 = Release|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Release|x86.ActiveCfg = Release|Any CPU + {D8239A8C-F692-460A-B204-5CF05502BEE2}.Release|x86.Build.0 = Release|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Debug|x64.ActiveCfg = Debug|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Debug|x64.Build.0 = Debug|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Debug|x86.ActiveCfg = Debug|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Debug|x86.Build.0 = Debug|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Release|Any CPU.Build.0 = Release|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Release|x64.ActiveCfg = Release|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Release|x64.Build.0 = Release|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Release|x86.ActiveCfg = Release|Any CPU + {9F973483-5D32-4093-88F0-761C9BEAEE04}.Release|x86.Build.0 = Release|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Debug|x64.ActiveCfg = Debug|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Debug|x64.Build.0 = Debug|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Debug|x86.ActiveCfg = Debug|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Debug|x86.Build.0 = Debug|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|Any CPU.Build.0 = Release|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x64.ActiveCfg = Release|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x64.Build.0 = Release|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.ActiveCfg = Release|Any CPU + {D0204B45-8528-4504-9FC1-D229F3A33896}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -853,6 +1040,20 @@ Global {0233F7EB-B8A4-4B75-A8A7-F1FF87DBF779} = {650A4392-A1A3-495B-8AB9-3361CFB6A7C1} {27E3DED6-A27C-4816-A6A1-B6E4783492F2} = {AE0E9F81-00BE-4A07-9C7D-C17E2B050C5F} {A9866990-FDAD-4D58-99EE-3C8730B1F4B1} = {E0D9867D-C23D-43EB-8D9C-DE0398A25432} + {5140ABCA-53D1-4748-9334-5A9579042E56} = {7CF63806-4C4F-4C48-8922-A75113975308} + {12AC0566-2B11-433D-81D7-7116C939FAFE} = {4967DE1B-FEC2-4C2B-8F7F-6262D67C9434} + {4967DE1B-FEC2-4C2B-8F7F-6262D67C9434} = {7CF63806-4C4F-4C48-8922-A75113975308} + {BD7B3AD8-0BA6-405F-8CF6-24B9464D4B5B} = {4967DE1B-FEC2-4C2B-8F7F-6262D67C9434} + {D147EB7D-776C-4153-9293-296FCB6568BD} = {BD7B3AD8-0BA6-405F-8CF6-24B9464D4B5B} + {9FC5644F-21D6-415B-8EBE-D49FA014C934} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B} + {85E30300-8205-4E1F-A141-0642CE146B65} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B} + {7EE15C68-E49B-4362-A53D-A71193B0A3D1} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B} + {112CDD7E-8DEE-407B-A52F-E436CD748F0F} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B} + {E949DA91-9023-4B2A-B16E-F8CFE85F3074} = {E72E405C-C1DA-41FE-8AF0-49C5E5CB496B} + {7583CA2C-249C-44A2-8499-8D4C1AB35ADE} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C} + {D8239A8C-F692-460A-B204-5CF05502BEE2} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C} + {9F973483-5D32-4093-88F0-761C9BEAEE04} = {EDF56413-B406-4200-B4D4-0EE3F9CB8F7C} + {D0204B45-8528-4504-9FC1-D229F3A33896} = {7A493DEA-32F2-4AB1-9113-828D44F5DDA2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {83786312-A93B-4BB4-AB06-7C6913A59AFA} diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/IResponseCachingFeature.cs b/src/Middleware/ResponseCaching.Abstractions/src/IResponseCachingFeature.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/IResponseCachingFeature.cs rename to src/Middleware/ResponseCaching.Abstractions/src/IResponseCachingFeature.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj similarity index 76% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj rename to src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj index 426d1e095f..fc79cf53d4 100644 --- a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj +++ b/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Middleware/ResponseCaching.Abstractions/src/baseline.netcore.json b/src/Middleware/ResponseCaching.Abstractions/src/baseline.netcore.json new file mode 100644 index 0000000000..56b84962ce --- /dev/null +++ b/src/Middleware/ResponseCaching.Abstractions/src/baseline.netcore.json @@ -0,0 +1,34 @@ +{ + "AssemblyIdentity": "Microsoft.AspNetCore.ResponseCaching.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.AspNetCore.ResponseCaching.IResponseCachingFeature", + "Visibility": "Public", + "Kind": "Interface", + "Abstract": true, + "ImplementedInterfaces": [], + "Members": [ + { + "Kind": "Method", + "Name": "get_VaryByQueryKeys", + "Parameters": [], + "ReturnType": "System.String[]", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "set_VaryByQueryKeys", + "Parameters": [ + { + "Name": "value", + "Type": "System.String[]" + } + ], + "ReturnType": "System.Void", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file diff --git a/src/ResponseCaching/samples/ResponseCachingSample/README.md b/src/Middleware/ResponseCaching/samples/ResponseCachingSample/README.md similarity index 100% rename from src/ResponseCaching/samples/ResponseCachingSample/README.md rename to src/Middleware/ResponseCaching/samples/ResponseCachingSample/README.md diff --git a/src/Middleware/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj b/src/Middleware/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj new file mode 100644 index 0000000000..a81712c49f --- /dev/null +++ b/src/Middleware/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/src/ResponseCaching/samples/ResponseCachingSample/Startup.cs b/src/Middleware/ResponseCaching/samples/ResponseCachingSample/Startup.cs similarity index 100% rename from src/ResponseCaching/samples/ResponseCachingSample/Startup.cs rename to src/Middleware/ResponseCaching/samples/ResponseCachingSample/Startup.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/CacheEntry/CacheEntryHelpers .cs b/src/Middleware/ResponseCaching/src/Internal/CacheEntry/CacheEntryHelpers .cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/CacheEntry/CacheEntryHelpers .cs rename to src/Middleware/ResponseCaching/src/Internal/CacheEntry/CacheEntryHelpers .cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/CacheEntry/CachedResponse.cs b/src/Middleware/ResponseCaching/src/Internal/CacheEntry/CachedResponse.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/CacheEntry/CachedResponse.cs rename to src/Middleware/ResponseCaching/src/Internal/CacheEntry/CachedResponse.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/CacheEntry/CachedVaryByRules.cs b/src/Middleware/ResponseCaching/src/Internal/CacheEntry/CachedVaryByRules.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/CacheEntry/CachedVaryByRules.cs rename to src/Middleware/ResponseCaching/src/Internal/CacheEntry/CachedVaryByRules.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/FastGuid.cs b/src/Middleware/ResponseCaching/src/Internal/FastGuid.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/FastGuid.cs rename to src/Middleware/ResponseCaching/src/Internal/FastGuid.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ISystemClock.cs b/src/Middleware/ResponseCaching/src/Internal/ISystemClock.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ISystemClock.cs rename to src/Middleware/ResponseCaching/src/Internal/ISystemClock.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCache.cs b/src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCache.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCache.cs rename to src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCache.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCacheEntry.cs b/src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCacheEntry.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCacheEntry.cs rename to src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCacheEntry.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCachingKeyProvider.cs b/src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCachingKeyProvider.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCachingKeyProvider.cs rename to src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCachingKeyProvider.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCachingPolicyProvider.cs b/src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCachingPolicyProvider.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/Interfaces/IResponseCachingPolicyProvider.cs rename to src/Middleware/ResponseCaching/src/Internal/Interfaces/IResponseCachingPolicyProvider.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/LoggerExtensions.cs b/src/Middleware/ResponseCaching/src/Internal/LoggerExtensions.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/LoggerExtensions.cs rename to src/Middleware/ResponseCaching/src/Internal/LoggerExtensions.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryCachedResponse.cs b/src/Middleware/ResponseCaching/src/Internal/MemoryCachedResponse.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryCachedResponse.cs rename to src/Middleware/ResponseCaching/src/Internal/MemoryCachedResponse.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryResponseCache.cs b/src/Middleware/ResponseCaching/src/Internal/MemoryResponseCache.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/MemoryResponseCache.cs rename to src/Middleware/ResponseCaching/src/Internal/MemoryResponseCache.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ResponseCachingContext.cs b/src/Middleware/ResponseCaching/src/Internal/ResponseCachingContext.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ResponseCachingContext.cs rename to src/Middleware/ResponseCaching/src/Internal/ResponseCachingContext.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ResponseCachingKeyProvider.cs b/src/Middleware/ResponseCaching/src/Internal/ResponseCachingKeyProvider.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ResponseCachingKeyProvider.cs rename to src/Middleware/ResponseCaching/src/Internal/ResponseCachingKeyProvider.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ResponseCachingPolicyProvider.cs b/src/Middleware/ResponseCaching/src/Internal/ResponseCachingPolicyProvider.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/ResponseCachingPolicyProvider.cs rename to src/Middleware/ResponseCaching/src/Internal/ResponseCachingPolicyProvider.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/SendFileFeatureWrapper.cs b/src/Middleware/ResponseCaching/src/Internal/SendFileFeatureWrapper.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/SendFileFeatureWrapper.cs rename to src/Middleware/ResponseCaching/src/Internal/SendFileFeatureWrapper.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/StringBuilderExtensions.cs b/src/Middleware/ResponseCaching/src/Internal/StringBuilderExtensions.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/StringBuilderExtensions.cs rename to src/Middleware/ResponseCaching/src/Internal/StringBuilderExtensions.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/SystemClock.cs b/src/Middleware/ResponseCaching/src/Internal/SystemClock.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Internal/SystemClock.cs rename to src/Middleware/ResponseCaching/src/Internal/SystemClock.cs diff --git a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj new file mode 100644 index 0000000000..727a9397bc --- /dev/null +++ b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj @@ -0,0 +1,20 @@ + + + + ASP.NET Core middleware for caching HTTP responses on the server. + netcoreapp3.0 + $(NoWarn);CS1591 + true + true + aspnetcore;cache;caching + + + + + + + + + + + diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Properties/AssemblyInfo.cs b/src/Middleware/ResponseCaching/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Properties/AssemblyInfo.cs rename to src/Middleware/ResponseCaching/src/Properties/AssemblyInfo.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingExtensions.cs b/src/Middleware/ResponseCaching/src/ResponseCachingExtensions.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingExtensions.cs rename to src/Middleware/ResponseCaching/src/ResponseCachingExtensions.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingFeature.cs b/src/Middleware/ResponseCaching/src/ResponseCachingFeature.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingFeature.cs rename to src/Middleware/ResponseCaching/src/ResponseCachingFeature.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs b/src/Middleware/ResponseCaching/src/ResponseCachingMiddleware.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingMiddleware.cs rename to src/Middleware/ResponseCaching/src/ResponseCachingMiddleware.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingOptions.cs b/src/Middleware/ResponseCaching/src/ResponseCachingOptions.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingOptions.cs rename to src/Middleware/ResponseCaching/src/ResponseCachingOptions.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingServicesExtensions.cs b/src/Middleware/ResponseCaching/src/ResponseCachingServicesExtensions.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/ResponseCachingServicesExtensions.cs rename to src/Middleware/ResponseCaching/src/ResponseCachingServicesExtensions.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs b/src/Middleware/ResponseCaching/src/Streams/ResponseCachingStream.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs rename to src/Middleware/ResponseCaching/src/Streams/ResponseCachingStream.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs b/src/Middleware/ResponseCaching/src/Streams/SegmentReadStream.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs rename to src/Middleware/ResponseCaching/src/Streams/SegmentReadStream.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs b/src/Middleware/ResponseCaching/src/Streams/SegmentWriteStream.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs rename to src/Middleware/ResponseCaching/src/Streams/SegmentWriteStream.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/StreamUtilities.cs b/src/Middleware/ResponseCaching/src/Streams/StreamUtilities.cs similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Streams/StreamUtilities.cs rename to src/Middleware/ResponseCaching/src/Streams/StreamUtilities.cs diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/baseline.netcore.json b/src/Middleware/ResponseCaching/src/baseline.netcore.json similarity index 100% rename from src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/baseline.netcore.json rename to src/Middleware/ResponseCaching/src/baseline.netcore.json diff --git a/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj b/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj new file mode 100644 index 0000000000..c651c4574e --- /dev/null +++ b/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingFeatureTests.cs b/src/Middleware/ResponseCaching/test/ResponseCachingFeatureTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingFeatureTests.cs rename to src/Middleware/ResponseCaching/test/ResponseCachingFeatureTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingKeyProviderTests.cs b/src/Middleware/ResponseCaching/test/ResponseCachingKeyProviderTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingKeyProviderTests.cs rename to src/Middleware/ResponseCaching/test/ResponseCachingKeyProviderTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingMiddlewareTests.cs b/src/Middleware/ResponseCaching/test/ResponseCachingMiddlewareTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingMiddlewareTests.cs rename to src/Middleware/ResponseCaching/test/ResponseCachingMiddlewareTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingPolicyProviderTests.cs b/src/Middleware/ResponseCaching/test/ResponseCachingPolicyProviderTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingPolicyProviderTests.cs rename to src/Middleware/ResponseCaching/test/ResponseCachingPolicyProviderTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingTests.cs b/src/Middleware/ResponseCaching/test/ResponseCachingTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/ResponseCachingTests.cs rename to src/Middleware/ResponseCaching/test/ResponseCachingTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/SegmentReadStreamTests.cs b/src/Middleware/ResponseCaching/test/SegmentReadStreamTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/SegmentReadStreamTests.cs rename to src/Middleware/ResponseCaching/test/SegmentReadStreamTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/SegmentWriteStreamTests.cs b/src/Middleware/ResponseCaching/test/SegmentWriteStreamTests.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/SegmentWriteStreamTests.cs rename to src/Middleware/ResponseCaching/test/SegmentWriteStreamTests.cs diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/TestUtils.cs b/src/Middleware/ResponseCaching/test/TestUtils.cs similarity index 100% rename from src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/TestUtils.cs rename to src/Middleware/ResponseCaching/test/TestUtils.cs diff --git a/src/StaticFiles/samples/StaticFileSample/Startup.cs b/src/Middleware/StaticFiles/samples/StaticFileSample/Startup.cs similarity index 100% rename from src/StaticFiles/samples/StaticFileSample/Startup.cs rename to src/Middleware/StaticFiles/samples/StaticFileSample/Startup.cs diff --git a/src/Middleware/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj b/src/Middleware/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj new file mode 100644 index 0000000000..830cfd2a91 --- /dev/null +++ b/src/Middleware/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp3.0 + + + + + + + + + + diff --git a/src/StaticFiles/samples/StaticFileSample/wwwroot/htmlpage.html b/src/Middleware/StaticFiles/samples/StaticFileSample/wwwroot/htmlpage.html similarity index 100% rename from src/StaticFiles/samples/StaticFileSample/wwwroot/htmlpage.html rename to src/Middleware/StaticFiles/samples/StaticFileSample/wwwroot/htmlpage.html diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Constants.cs b/src/Middleware/StaticFiles/src/Constants.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Constants.cs rename to src/Middleware/StaticFiles/src/Constants.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml b/src/Middleware/StaticFiles/src/CustomDictionary.xml similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml rename to src/Middleware/StaticFiles/src/CustomDictionary.xml diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs b/src/Middleware/StaticFiles/src/DefaultFilesExtensions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs rename to src/Middleware/StaticFiles/src/DefaultFilesExtensions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs b/src/Middleware/StaticFiles/src/DefaultFilesMiddleware.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs rename to src/Middleware/StaticFiles/src/DefaultFilesMiddleware.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs b/src/Middleware/StaticFiles/src/DefaultFilesOptions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs rename to src/Middleware/StaticFiles/src/DefaultFilesOptions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs b/src/Middleware/StaticFiles/src/DirectoryBrowserExtensions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs rename to src/Middleware/StaticFiles/src/DirectoryBrowserExtensions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Middleware/StaticFiles/src/DirectoryBrowserMiddleware.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs rename to src/Middleware/StaticFiles/src/DirectoryBrowserMiddleware.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs b/src/Middleware/StaticFiles/src/DirectoryBrowserOptions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs rename to src/Middleware/StaticFiles/src/DirectoryBrowserOptions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs b/src/Middleware/StaticFiles/src/DirectoryBrowserServiceExtensions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs rename to src/Middleware/StaticFiles/src/DirectoryBrowserServiceExtensions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs b/src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs rename to src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs b/src/Middleware/StaticFiles/src/FileServerExtensions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs rename to src/Middleware/StaticFiles/src/FileServerExtensions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs b/src/Middleware/StaticFiles/src/FileServerOptions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs rename to src/Middleware/StaticFiles/src/FileServerOptions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs b/src/Middleware/StaticFiles/src/Helpers.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs rename to src/Middleware/StaticFiles/src/Helpers.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs b/src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs rename to src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs b/src/Middleware/StaticFiles/src/IContentTypeProvider.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs rename to src/Middleware/StaticFiles/src/IContentTypeProvider.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs b/src/Middleware/StaticFiles/src/IDirectoryFormatter.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs rename to src/Middleware/StaticFiles/src/IDirectoryFormatter.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs b/src/Middleware/StaticFiles/src/Infrastructure/SharedOptions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs rename to src/Middleware/StaticFiles/src/Infrastructure/SharedOptions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Middleware/StaticFiles/src/Infrastructure/SharedOptionsBase.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs rename to src/Middleware/StaticFiles/src/Infrastructure/SharedOptionsBase.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs b/src/Middleware/StaticFiles/src/LoggerExtensions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs rename to src/Middleware/StaticFiles/src/LoggerExtensions.cs diff --git a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj new file mode 100644 index 0000000000..2c3d4c9b45 --- /dev/null +++ b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj @@ -0,0 +1,23 @@ + + + + ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files. + netcoreapp3.0 + $(NoWarn);CS1591 + true + aspnetcore;staticfiles + + + + + + + + + + + + + + + diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs b/src/Middleware/StaticFiles/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs rename to src/Middleware/StaticFiles/src/Properties/AssemblyInfo.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs b/src/Middleware/StaticFiles/src/Resources.Designer.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs rename to src/Middleware/StaticFiles/src/Resources.Designer.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.resx b/src/Middleware/StaticFiles/src/Resources.resx similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.resx rename to src/Middleware/StaticFiles/src/Resources.resx diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/Middleware/StaticFiles/src/StaticFileContext.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs rename to src/Middleware/StaticFiles/src/StaticFileContext.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs b/src/Middleware/StaticFiles/src/StaticFileExtensions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs rename to src/Middleware/StaticFiles/src/StaticFileExtensions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs b/src/Middleware/StaticFiles/src/StaticFileMiddleware.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs rename to src/Middleware/StaticFiles/src/StaticFileMiddleware.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs b/src/Middleware/StaticFiles/src/StaticFileOptions.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs rename to src/Middleware/StaticFiles/src/StaticFileOptions.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs b/src/Middleware/StaticFiles/src/StaticFileResponseContext.cs similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs rename to src/Middleware/StaticFiles/src/StaticFileResponseContext.cs diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json b/src/Middleware/StaticFiles/src/baseline.netcore.json similarity index 100% rename from src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json rename to src/Middleware/StaticFiles/src/baseline.netcore.json diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj similarity index 52% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj rename to src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index 6b91e30e32..b8b44e67e4 100644 --- a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -11,7 +11,7 @@ - + PreserveNewest @@ -22,14 +22,14 @@ - + - - - - + + + + diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs rename to src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt b/src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/Empty.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt rename to src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/Empty.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt b/src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/SingleByte.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt rename to src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/SingleByte.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html b/src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/default.html similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html rename to src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/default.html diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml b/src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/extra.xml similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml rename to src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/extra.xml diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt b/src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/ranges.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt rename to src/Middleware/StaticFiles/test/FunctionalTests/SubFolder/ranges.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt b/src/Middleware/StaticFiles/test/FunctionalTests/TestDocument.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt rename to src/Middleware/StaticFiles/test/FunctionalTests/TestDocument.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt b/src/Middleware/StaticFiles/test/FunctionalTests/TestDocument1MB.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt rename to src/Middleware/StaticFiles/test/FunctionalTests/TestDocument1MB.txt diff --git a/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj b/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj new file mode 100644 index 0000000000..3be3e75e33 --- /dev/null +++ b/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + + diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs b/src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/RangeHelperTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs rename to src/Middleware/StaticFiles/test/RangeHelper.Sources.Test/RangeHelperTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs b/src/Middleware/StaticFiles/test/Tests/CacheHeaderTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs rename to src/Middleware/StaticFiles/test/Tests/CacheHeaderTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs b/src/Middleware/StaticFiles/test/Tests/DefaultContentTypeProviderTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs rename to src/Middleware/StaticFiles/test/Tests/DefaultContentTypeProviderTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/src/Middleware/StaticFiles/test/Tests/DefaultFilesMiddlewareTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs rename to src/Middleware/StaticFiles/test/Tests/DefaultFilesMiddlewareTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/src/Middleware/StaticFiles/test/Tests/DirectoryBrowserMiddlewareTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs rename to src/Middleware/StaticFiles/test/Tests/DirectoryBrowserMiddlewareTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj b/src/Middleware/StaticFiles/test/Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj similarity index 52% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj rename to src/Middleware/StaticFiles/test/Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj index c3dad0662d..416f29d508 100644 --- a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj +++ b/src/Middleware/StaticFiles/test/Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj @@ -5,7 +5,7 @@ - + PreserveNewest PreserveNewest @@ -13,12 +13,8 @@ - - - - - - + + diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs b/src/Middleware/StaticFiles/test/Tests/RangeHeaderTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs rename to src/Middleware/StaticFiles/test/Tests/RangeHeaderTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs b/src/Middleware/StaticFiles/test/Tests/StaticFileContextTest.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs rename to src/Middleware/StaticFiles/test/Tests/StaticFileContextTest.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/Tests/StaticFileMiddlewareTests.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs rename to src/Middleware/StaticFiles/test/Tests/StaticFileMiddlewareTests.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs b/src/Middleware/StaticFiles/test/Tests/StaticFilesTestServer.cs similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs rename to src/Middleware/StaticFiles/test/Tests/StaticFilesTestServer.cs diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt b/src/Middleware/StaticFiles/test/Tests/SubFolder/Empty.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt rename to src/Middleware/StaticFiles/test/Tests/SubFolder/Empty.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt b/src/Middleware/StaticFiles/test/Tests/SubFolder/SingleByte.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt rename to src/Middleware/StaticFiles/test/Tests/SubFolder/SingleByte.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html b/src/Middleware/StaticFiles/test/Tests/SubFolder/default.html similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html rename to src/Middleware/StaticFiles/test/Tests/SubFolder/default.html diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml b/src/Middleware/StaticFiles/test/Tests/SubFolder/extra.xml similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml rename to src/Middleware/StaticFiles/test/Tests/SubFolder/extra.xml diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt b/src/Middleware/StaticFiles/test/Tests/SubFolder/ranges.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt rename to src/Middleware/StaticFiles/test/Tests/SubFolder/ranges.txt diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html b/src/Middleware/StaticFiles/test/Tests/SubFolder/你好/default.html similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html rename to src/Middleware/StaticFiles/test/Tests/SubFolder/你好/default.html diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html b/src/Middleware/StaticFiles/test/Tests/SubFolder/你好/世界/default.html similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html rename to src/Middleware/StaticFiles/test/Tests/SubFolder/你好/世界/default.html diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt b/src/Middleware/StaticFiles/test/Tests/TestDocument.txt similarity index 100% rename from src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt rename to src/Middleware/StaticFiles/test/Tests/TestDocument.txt diff --git a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs index e1e86143a6..dcce55d223 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs +++ b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest // Skip if wstest is not installed for now, see https://github.com/aspnet/WebSockets/issues/95 // We will enable Wstest on every build once we've gotten the necessary infrastructure sorted out :). - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/4350")] [SkipIfWsTestNotPresent] public async Task AutobahnTestSuite() { diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj index d1e9953b50..73bfa29eca 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj @@ -16,6 +16,10 @@ Microsoft.AspNetCore.Mvc.RouteAttribute aspnetcore;aspnetcoremvc + + + + @@ -42,7 +46,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - diff --git a/src/ResponseCaching/.gitignore b/src/ResponseCaching/.gitignore deleted file mode 100644 index 23826aae91..0000000000 --- a/src/ResponseCaching/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -*.sln.ide -project.lock.json -/.vs/ -.vscode/ -.build/ -.testPublish/ -launchSettings.json -global.json diff --git a/src/ResponseCaching/Directory.Build.props b/src/ResponseCaching/Directory.Build.props deleted file mode 100644 index cd0187875b..0000000000 --- a/src/ResponseCaching/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - - - diff --git a/src/ResponseCaching/Directory.Build.targets b/src/ResponseCaching/Directory.Build.targets deleted file mode 100644 index 7a09b207eb..0000000000 --- a/src/ResponseCaching/Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - $(MicrosoftNETCoreAppPackageVersion) - - diff --git a/src/ResponseCaching/NuGetPackageVerifier.json b/src/ResponseCaching/NuGetPackageVerifier.json deleted file mode 100644 index b153ab1515..0000000000 --- a/src/ResponseCaching/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/ResponseCaching/README.md b/src/ResponseCaching/README.md deleted file mode 100644 index c0d6b43323..0000000000 --- a/src/ResponseCaching/README.md +++ /dev/null @@ -1,8 +0,0 @@ -ASP.NET Core Response Caching [Archived] -======================================== - -**This GitHub project has been archived.** Ongoing development on this project can be found in . - -This repo hosts the ASP.NET Core middleware for response caching. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [AspNetCore](https://github.com/aspnet/AspNetCore) repo. diff --git a/src/ResponseCaching/ResponseCaching.sln b/src/ResponseCaching/ResponseCaching.sln deleted file mode 100644 index 69a5397248..0000000000 --- a/src/ResponseCaching/ResponseCaching.sln +++ /dev/null @@ -1,66 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{367AABAF-E03C-4491-A9A7-BDDE8903D1B4}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C51DF5BD-B53D-4795-BC01-A9AB066BF286}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{89A50974-E9D4-4F87-ACF2-6A6005E64931}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseCachingSample", "samples\ResponseCachingSample\ResponseCachingSample.csproj", "{1139BDEE-FA15-474D-8855-0AB91F23CF26}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Tests", "test\Microsoft.AspNetCore.ResponseCaching.Tests\Microsoft.AspNetCore.ResponseCaching.Tests.csproj", "{151B2027-3936-44B9-A4A0-E1E5902125AB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "src\Microsoft.AspNetCore.ResponseCaching\Microsoft.AspNetCore.ResponseCaching.csproj", "{D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "src\Microsoft.AspNetCore.ResponseCaching.Abstractions\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{2D1022E8-CBB6-478D-A420-CB888D0EF7B7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B984DDCF-0D61-44C4-9D30-2BC59EE6BD29}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1139BDEE-FA15-474D-8855-0AB91F23CF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1139BDEE-FA15-474D-8855-0AB91F23CF26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1139BDEE-FA15-474D-8855-0AB91F23CF26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1139BDEE-FA15-474D-8855-0AB91F23CF26}.Release|Any CPU.Build.0 = Release|Any CPU - {151B2027-3936-44B9-A4A0-E1E5902125AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {151B2027-3936-44B9-A4A0-E1E5902125AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {151B2027-3936-44B9-A4A0-E1E5902125AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {151B2027-3936-44B9-A4A0-E1E5902125AB}.Release|Any CPU.Build.0 = Release|Any CPU - {D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6}.Release|Any CPU.Build.0 = Release|Any CPU - {2D1022E8-CBB6-478D-A420-CB888D0EF7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D1022E8-CBB6-478D-A420-CB888D0EF7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D1022E8-CBB6-478D-A420-CB888D0EF7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D1022E8-CBB6-478D-A420-CB888D0EF7B7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1139BDEE-FA15-474D-8855-0AB91F23CF26} = {C51DF5BD-B53D-4795-BC01-A9AB066BF286} - {151B2027-3936-44B9-A4A0-E1E5902125AB} = {89A50974-E9D4-4F87-ACF2-6A6005E64931} - {D1031270-DBD3-4F02-A3DC-3E7DADE8EBE6} = {367AABAF-E03C-4491-A9A7-BDDE8903D1B4} - {2D1022E8-CBB6-478D-A420-CB888D0EF7B7} = {367AABAF-E03C-4491-A9A7-BDDE8903D1B4} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6F6B4994-06D7-4D35-B0F7-F60913AA8402} - EndGlobalSection -EndGlobal diff --git a/src/ResponseCaching/build/Key.snk b/src/ResponseCaching/build/Key.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/src/ResponseCaching/build/Key.snk and /dev/null differ diff --git a/src/ResponseCaching/build/dependencies.props b/src/ResponseCaching/build/dependencies.props deleted file mode 100644 index 2229ff3e25..0000000000 --- a/src/ResponseCaching/build/dependencies.props +++ /dev/null @@ -1,26 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 3.0.0-alpha1-20181004.7 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 2.0.9 - 2.1.3 - 2.2.0-preview2-26905-02 - 15.6.1 - 2.0.3 - 2.3.1 - 2.4.0 - - - - diff --git a/src/ResponseCaching/build/repo.props b/src/ResponseCaching/build/repo.props deleted file mode 100644 index e3e0fa123b..0000000000 --- a/src/ResponseCaching/build/repo.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/ResponseCaching/build/sources.props b/src/ResponseCaching/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/ResponseCaching/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/src/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj b/src/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj deleted file mode 100644 index 13ec354705..0000000000 --- a/src/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - diff --git a/src/ResponseCaching/src/Directory.Build.props b/src/ResponseCaching/src/Directory.Build.props deleted file mode 100644 index 1e0980f663..0000000000 --- a/src/ResponseCaching/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/baseline.netcore.json b/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/baseline.netcore.json deleted file mode 100644 index f8993e5232..0000000000 --- a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/baseline.netcore.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.AspNetCore.ResponseCaching.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.AspNetCore.ResponseCaching.IResponseCachingFeature", - "Visibility": "Public", - "Kind": "Interface", - "Abstract": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_VaryByQueryKeys", - "Parameters": [], - "ReturnType": "System.String[]", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_VaryByQueryKeys", - "Parameters": [ - { - "Name": "value", - "Type": "System.String[]" - } - ], - "ReturnType": "System.Void", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj b/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj deleted file mode 100644 index f98b1a1ce5..0000000000 --- a/src/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - ASP.NET Core middleware for caching HTTP responses on the server. - netcoreapp3.0 - $(NoWarn);CS1591 - true - true - aspnetcore;cache;caching - - - - - - - - - - - - - - diff --git a/src/ResponseCaching/test/Directory.Build.props b/src/ResponseCaching/test/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/ResponseCaching/test/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj b/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj deleted file mode 100644 index 851c57e5c5..0000000000 --- a/src/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - - - - diff --git a/src/ResponseCaching/version.props b/src/ResponseCaching/version.props deleted file mode 100644 index d977b437b6..0000000000 --- a/src/ResponseCaching/version.props +++ /dev/null @@ -1,6 +0,0 @@ - - - 3.0.0 - dev - - diff --git a/src/StaticFiles/shared/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs b/src/Shared/RangeHelper/RangeHelper.cs similarity index 100% rename from src/StaticFiles/shared/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs rename to src/Shared/RangeHelper/RangeHelper.cs diff --git a/src/StaticFiles/.gitignore b/src/StaticFiles/.gitignore deleted file mode 100644 index bcc811de9a..0000000000 --- a/src/StaticFiles/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -*.sln.ide -project.lock.json -.build/ -.testPublish/ -/.vs/ -global.json diff --git a/src/StaticFiles/Directory.Build.props b/src/StaticFiles/Directory.Build.props deleted file mode 100644 index cd0187875b..0000000000 --- a/src/StaticFiles/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - - - diff --git a/src/StaticFiles/Directory.Build.targets b/src/StaticFiles/Directory.Build.targets deleted file mode 100644 index 7a09b207eb..0000000000 --- a/src/StaticFiles/Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - $(MicrosoftNETCoreAppPackageVersion) - - diff --git a/src/StaticFiles/NuGetPackageVerifier.json b/src/StaticFiles/NuGetPackageVerifier.json deleted file mode 100644 index 4328f86b21..0000000000 --- a/src/StaticFiles/NuGetPackageVerifier.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "adx-nonshipping": { - "rules": [], - "packages": { - "Microsoft.AspNetCore.RangeHelper.Sources": {} - } - }, - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/StaticFiles/README.md b/src/StaticFiles/README.md deleted file mode 100644 index dca5218cb5..0000000000 --- a/src/StaticFiles/README.md +++ /dev/null @@ -1,10 +0,0 @@ -StaticFiles -=========== - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/ibwhfogib5key90k/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/StaticFiles/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/StaticFiles.svg?branch=dev)](https://travis-ci.org/aspnet/StaticFiles) - -This repo contains middleware for handling requests for file system resources including files and directories. - -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/src/StaticFiles/StaticFiles.sln b/src/StaticFiles/StaticFiles.sln deleted file mode 100644 index d35843bf61..0000000000 --- a/src/StaticFiles/StaticFiles.sln +++ /dev/null @@ -1,127 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40EE0889-960E-41B4-A3D3-9CE963EB0797}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8B21A3A9-9CA6-4857-A6E0-1A3203404B60}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.csproj", "{8D7BC5A4-F19C-4184-8338-A6B42997218C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticFileSample", "samples\StaticFileSample\StaticFileSample.csproj", "{092141D9-305A-4FC5-AE74-CB23982CA8D4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF02AFE8-7C15-4DDB-8B2C-58A676112A98}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.Tests", "test\Microsoft.AspNetCore.StaticFiles.Tests\Microsoft.AspNetCore.StaticFiles.Tests.csproj", "{CC87FE7D-8F42-4BE9-A152-9625E837C1E5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.FunctionalTests", "test\Microsoft.AspNetCore.StaticFiles.FunctionalTests\Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj", "{FDF0539C-1F62-4B78-91B1-C687886931CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RangeHelper.Sources.Test", "test\Microsoft.AspNetCore.RangeHelper.Sources.Test\Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj", "{D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{360DC2F8-EEB4-4C69-9784-C686EAD78279}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AspNetCore.RangeHelper.Sources", "Microsoft.AspNetCore.RangeHelper.Sources", "{DB6A1D14-B8A2-488F-9C4B-422FD45C8853}" - ProjectSection(SolutionItems) = preProject - shared\Microsoft.AspNetCore.RangeHelper.Sources\RangeHelper.cs = shared\Microsoft.AspNetCore.RangeHelper.Sources\RangeHelper.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE015849-E126-4DFA-A754-E1AC3B1E7925}" - ProjectSection(SolutionItems) = preProject - .appveyor.yml = .appveyor.yml - .travis.yml = .travis.yml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D3F67455-9FB9-4354-93EC-B05D755114E9}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\repo.props = build\repo.props - build\sources.props = build\sources.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|x86.ActiveCfg = Debug|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Any CPU.Build.0 = Release|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|x86.ActiveCfg = Release|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|x86.ActiveCfg = Debug|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Any CPU.Build.0 = Release|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|x86.ActiveCfg = Release|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Debug|x86.ActiveCfg = Debug|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Release|Any CPU.Build.0 = Release|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5}.Release|x86.ActiveCfg = Release|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Debug|x86.ActiveCfg = Debug|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Debug|x86.Build.0 = Debug|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Release|Any CPU.Build.0 = Release|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Release|x86.ActiveCfg = Release|Any CPU - {FDF0539C-1F62-4B78-91B1-C687886931CA}.Release|x86.Build.0 = Release|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Debug|x86.ActiveCfg = Debug|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Debug|x86.Build.0 = Debug|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Release|Any CPU.Build.0 = Release|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Release|x86.ActiveCfg = Release|Any CPU - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {8D7BC5A4-F19C-4184-8338-A6B42997218C} = {40EE0889-960E-41B4-A3D3-9CE963EB0797} - {092141D9-305A-4FC5-AE74-CB23982CA8D4} = {8B21A3A9-9CA6-4857-A6E0-1A3203404B60} - {CC87FE7D-8F42-4BE9-A152-9625E837C1E5} = {EF02AFE8-7C15-4DDB-8B2C-58A676112A98} - {FDF0539C-1F62-4B78-91B1-C687886931CA} = {EF02AFE8-7C15-4DDB-8B2C-58A676112A98} - {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA} = {EF02AFE8-7C15-4DDB-8B2C-58A676112A98} - {DB6A1D14-B8A2-488F-9C4B-422FD45C8853} = {360DC2F8-EEB4-4C69-9784-C686EAD78279} - {D3F67455-9FB9-4354-93EC-B05D755114E9} = {DE015849-E126-4DFA-A754-E1AC3B1E7925} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {AF7F03BE-0DB2-48EF-8185-7698995658A6} - EndGlobalSection -EndGlobal diff --git a/src/StaticFiles/build/Key.snk b/src/StaticFiles/build/Key.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/src/StaticFiles/build/Key.snk and /dev/null differ diff --git a/src/StaticFiles/build/dependencies.props b/src/StaticFiles/build/dependencies.props deleted file mode 100644 index 86a35bf685..0000000000 --- a/src/StaticFiles/build/dependencies.props +++ /dev/null @@ -1,30 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 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 - 0.7.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-preview1-26907-05 - 15.6.1 - 4.10.0 - 0.10.0 - 2.3.1 - 2.4.0 - - - - diff --git a/src/StaticFiles/build/repo.props b/src/StaticFiles/build/repo.props deleted file mode 100644 index e3e0fa123b..0000000000 --- a/src/StaticFiles/build/repo.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/StaticFiles/build/sources.props b/src/StaticFiles/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/StaticFiles/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/src/StaticFiles/samples/StaticFileSample/Properties/launchSettings.json b/src/StaticFiles/samples/StaticFileSample/Properties/launchSettings.json deleted file mode 100644 index 50cb7a7470..0000000000 --- a/src/StaticFiles/samples/StaticFileSample/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:35192/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "StaticFileSample": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000/", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj b/src/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj deleted file mode 100644 index bf4f421553..0000000000 --- a/src/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - - diff --git a/src/StaticFiles/src/Directory.Build.props b/src/StaticFiles/src/Directory.Build.props deleted file mode 100644 index 1e0980f663..0000000000 --- a/src/StaticFiles/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj deleted file mode 100644 index 257d2fd29f..0000000000 --- a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files. - netcoreapp3.0 - $(NoWarn);CS1591 - true - aspnetcore;staticfiles - - - - - - - - - - - - - - - diff --git a/src/StaticFiles/test/Directory.Build.props b/src/StaticFiles/test/Directory.Build.props deleted file mode 100644 index c42d54465f..0000000000 --- a/src/StaticFiles/test/Directory.Build.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj b/src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj deleted file mode 100644 index 23408f55d0..0000000000 --- a/src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - - diff --git a/src/StaticFiles/version.props b/src/StaticFiles/version.props deleted file mode 100644 index d977b437b6..0000000000 --- a/src/StaticFiles/version.props +++ /dev/null @@ -1,6 +0,0 @@ - - - 3.0.0 - dev - -