diff --git a/build/buildorder.props b/build/buildorder.props index ec15a752e5..5a71a5701c 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index ea6d77931c..c4539a74ed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -81,6 +81,8 @@ 2.1.1 + 2.1.1 + 2.1.1 2.1.1 2.1.1 0.5.1 diff --git a/build/submodules.props b/build/submodules.props index c96fb1b2e1..01c2e2ed0d 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs index d57962e9f1..8bd24e52c9 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs @@ -37,7 +37,7 @@ namespace E2ETests return _smokeTestRunner.SmokeTestSuite(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone); } #if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each - [ConditionalFact(Skip = "https://github.com/aspnet/websdk/pull/322")] + [ConditionalFact] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] public Task SmokeTests_X64_IISExpress_Clr() { diff --git a/src/ServerTests/.gitignore b/src/ServerTests/.gitignore deleted file mode 100644 index a7760db659..0000000000 --- a/src/ServerTests/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_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 -project.lock.json -/.vs/ -.testPublish/ -.build/ -global.json diff --git a/src/ServerTests/Directory.Build.props b/src/ServerTests/Directory.Build.props deleted file mode 100644 index cefef093b1..0000000000 --- a/src/ServerTests/Directory.Build.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - true - - - - - - - diff --git a/src/ServerTests/Directory.Build.targets b/src/ServerTests/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/ServerTests/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/ServerTests/NuGetPackageVerifier.json b/src/ServerTests/NuGetPackageVerifier.json deleted file mode 100644 index 22ef3c09c0..0000000000 --- a/src/ServerTests/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} diff --git a/src/ServerTests/README.md b/src/ServerTests/README.md deleted file mode 100644 index 355a989132..0000000000 --- a/src/ServerTests/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Server Tests -============ - -[![Travis build status](https://img.shields.io/travis/aspnet/ServerTests.svg?label=travis-ci&branch=dev&style=flat-square)](https://travis-ci.org/aspnet/ServerTests/branches) -[![AppVeyor build status](https://img.shields.io/appveyor/ci/aspnetci/ServerTests/dev.svg?label=appveyor&style=flat-square)](https://ci.appveyor.com/project/aspnetci/ServerTests/branch/dev) - -This repo hosts [HttpSysServer](https://github.com/aspnet/HttpSysServer) and [Kestrel](https://github.com/aspnet/KestrelHttpServer) tests. - -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/ServerTests/ServerTests.sln b/src/ServerTests/ServerTests.sln deleted file mode 100644 index bd58846053..0000000000 --- a/src/ServerTests/ServerTests.sln +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49AB8AAA-8160-48DF-A18B-78F51E54E02A}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.config = NuGet.config - build\repo.props = build\repo.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FA91F388-F4AF-4850-9D68-D4D128E6B1A6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\ServerComparison.FunctionalTests\ServerComparison.FunctionalTests.csproj", "{A319ACCE-060B-4385-9534-9F2202F6180E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "test\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{030225D8-4EE8-47E5-B692-2A96B3B51A38}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{55694E45-5EDE-46F8-80AA-797DE5F8C5C3}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\repo.props = build\repo.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Any CPU.Build.0 = Release|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {A319ACCE-060B-4385-9534-9F2202F6180E} = {FA91F388-F4AF-4850-9D68-D4D128E6B1A6} - {030225D8-4EE8-47E5-B692-2A96B3B51A38} = {FA91F388-F4AF-4850-9D68-D4D128E6B1A6} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8A313020-8407-494F-81D7-7631580C5FCC} - EndGlobalSection -EndGlobal diff --git a/src/ServerTests/build/dependencies.props b/src/ServerTests/build/dependencies.props deleted file mode 100644 index 72cad24822..0000000000 --- a/src/ServerTests/build/dependencies.props +++ /dev/null @@ -1,39 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 0.5.1 - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.0.0 - 2.1.2 - 2.1.1 - 15.6.1 - 2.0.3 - 1.4.0 - 3.2.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - diff --git a/src/ServerTests/build/repo.props b/src/ServerTests/build/repo.props deleted file mode 100644 index 96c1270585..0000000000 --- a/src/ServerTests/build/repo.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ServerTests/build/sources.props b/src/ServerTests/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/ServerTests/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/ServerTests/install-nginx.sh b/src/ServerTests/install-nginx.sh deleted file mode 100644 index 9564813c2d..0000000000 --- a/src/ServerTests/install-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -curl -sSL http://nginx.org/download/nginx-1.8.0.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.8.0/ -./configure --prefix=$HOME/nginxinstall --with-http_ssl_module -make -make install diff --git a/src/ServerTests/test/Directory.Build.props b/src/ServerTests/test/Directory.Build.props deleted file mode 100644 index 620b803d21..0000000000 --- a/src/ServerTests/test/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - netcoreapp2.1;netcoreapp2.0 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);net461 - - diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj deleted file mode 100644 index ba0fea38e1..0000000000 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - netcoreapp2.1 - - - - - - - - - - - - - - - - - - - diff --git a/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json b/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json deleted file mode 100644 index 7e255d2086..0000000000 --- a/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:39982/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNET_ENVIRONMENT": "HelloWorld" - } - }, - "web": { - "commandName": "web", - "environmentVariables": { - "ASPNET_ENVIRONMENT": "HelloWorld" - } - } - } -} \ No newline at end of file diff --git a/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj deleted file mode 100644 index f3aa4898e5..0000000000 --- a/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - $(StandardTestTfms) - win7-x86;win7-x64;linux-x64;osx-x64 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ServerTests/version.props b/src/ServerTests/version.props deleted file mode 100644 index 669c874829..0000000000 --- a/src/ServerTests/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln new file mode 100644 index 0000000000..59d8df47dd --- /dev/null +++ b/src/Servers/FunctionalTests.sln @@ -0,0 +1,160 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{78018310-02F8-4BB8-A8E2-E88AF7A7F51E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "testassets\TestSites\ServerComparison.TestSites.csproj", "{7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{25B4D0F2-96D1-4F34-896E-ABA1E803A230}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{C36232B5-48B5-4D9D-A357-17278265827E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{4507F026-2C82-4DD7-965B-BD28C9F0EAB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression", "..\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj", "{4596F641-5AC2-4EC0-B7DD-998D1503D717}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{831EA089-7072-41CF-996A-75A3EF39D31E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9DD063D3-CAE1-49C2-9C24-DE3499E79322}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x64.ActiveCfg = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x64.Build.0 = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x86.ActiveCfg = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x86.Build.0 = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|Any CPU.Build.0 = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x64.ActiveCfg = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x64.Build.0 = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x86.ActiveCfg = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x86.Build.0 = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x64.ActiveCfg = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x64.Build.0 = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x86.Build.0 = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|Any CPU.Build.0 = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x64.ActiveCfg = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x64.Build.0 = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x86.ActiveCfg = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x86.Build.0 = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x64.ActiveCfg = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x64.Build.0 = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x86.ActiveCfg = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x86.Build.0 = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|Any CPU.Build.0 = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x64.ActiveCfg = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x64.Build.0 = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x86.ActiveCfg = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x86.Build.0 = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x64.ActiveCfg = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x64.Build.0 = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x86.Build.0 = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|Any CPU.Build.0 = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x64.ActiveCfg = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x64.Build.0 = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x86.ActiveCfg = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x86.Build.0 = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x64.ActiveCfg = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x64.Build.0 = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x86.ActiveCfg = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x86.Build.0 = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|Any CPU.Build.0 = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x64.ActiveCfg = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x64.Build.0 = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x86.ActiveCfg = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x86.Build.0 = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x64.ActiveCfg = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x64.Build.0 = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x86.ActiveCfg = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x86.Build.0 = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|Any CPU.Build.0 = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x64.ActiveCfg = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x64.Build.0 = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x86.ActiveCfg = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x86.Build.0 = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x64.ActiveCfg = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x64.Build.0 = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x86.ActiveCfg = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x86.Build.0 = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|Any CPU.Build.0 = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x64.ActiveCfg = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x64.Build.0 = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x86.ActiveCfg = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x86.Build.0 = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x64.ActiveCfg = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x64.Build.0 = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x86.ActiveCfg = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x86.Build.0 = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|Any CPU.Build.0 = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x64.ActiveCfg = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x64.Build.0 = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x86.ActiveCfg = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x86.Build.0 = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x64.ActiveCfg = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x64.Build.0 = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x86.ActiveCfg = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x86.Build.0 = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|Any CPU.Build.0 = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x64.ActiveCfg = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x64.Build.0 = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x86.ActiveCfg = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C36232B5-48B5-4D9D-A357-17278265827E} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {4596F641-5AC2-4EC0-B7DD-998D1503D717} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {831EA089-7072-41CF-996A-75A3EF39D31E} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {9DD063D3-CAE1-49C2-9C24-DE3499E79322} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F4D963C1-44FE-45AE-9B2A-11CD86C7539F} + EndGlobalSection +EndGlobal diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index fc5ab5abef..94eacdc098 100644 --- a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Fact] public Task HelloWorld_IISExpress_Clr_X64_Portable() { return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, "V1"); diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index a643a15bcb..8f4d0d1a63 100644 --- a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Fact] public Task NtlmAuthentication_Clr_X64_Portable() { return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, "V1"); diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/src/Servers/test/FunctionalTests/HelloWorldTest.cs similarity index 87% rename from src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs rename to src/Servers/test/FunctionalTests/HelloWorldTest.cs index 62e1fcfbd8..9b65060868 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/src/Servers/test/FunctionalTests/HelloWorldTest.cs @@ -32,9 +32,7 @@ namespace ServerComparison.FunctionalTests [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task HelloWorld_IISExpress(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return HelloWorld(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); @@ -66,11 +64,11 @@ namespace ServerComparison.FunctionalTests } - private async Task HelloWorld(ServerType serverType, - RuntimeFlavor runtimeFlavor, - RuntimeArchitecture architecture, - ApplicationType applicationType, - [CallerMemberName] string testName = null, + private async Task HelloWorld(ServerType serverType, + RuntimeFlavor runtimeFlavor, + RuntimeArchitecture architecture, + ApplicationType applicationType, + [CallerMemberName] string testName = null, HostingModel hostingModel = HostingModel.OutOfProcess, string additionalPublishParameters = "") { @@ -79,7 +77,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("HelloWorld"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"), diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs b/src/Servers/test/FunctionalTests/Helpers.cs similarity index 89% rename from src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs rename to src/Servers/test/FunctionalTests/Helpers.cs index 0c4c4ab89d..36864d684c 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs +++ b/src/Servers/test/FunctionalTests/Helpers.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -9,17 +9,17 @@ namespace ServerComparison.FunctionalTests { public class Helpers { - public static string GetApplicationPath(ApplicationType applicationType) + public static string GetApplicationPath() { var applicationBasePath = AppContext.BaseDirectory; var directoryInfo = new DirectoryInfo(applicationBasePath); do { - var solutionFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "ServerTests.sln")); + var solutionFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "FunctionalTests.sln")); if (solutionFileInfo.Exists) { - return Path.GetFullPath(Path.Combine(directoryInfo.FullName, "test", "ServerComparison.TestSites")); + return Path.GetFullPath(Path.Combine(directoryInfo.FullName, "testassets", "TestSites")); } directoryInfo = directoryInfo.Parent; @@ -66,4 +66,4 @@ namespace ServerComparison.FunctionalTests throw new ArgumentException($"Unknown RuntimeFlavor '{runtimeFlavor}'"); } } -} \ No newline at end of file +} diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/Http.config b/src/Servers/test/FunctionalTests/Http.config similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/Http.config rename to src/Servers/test/FunctionalTests/Http.config diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.conf b/src/Servers/test/FunctionalTests/NoCompression.conf similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.conf rename to src/Servers/test/FunctionalTests/NoCompression.conf diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.config b/src/Servers/test/FunctionalTests/NoCompression.config similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.config rename to src/Servers/test/FunctionalTests/NoCompression.config diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthentication.config b/src/Servers/test/FunctionalTests/NtlmAuthentication.config similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthentication.config rename to src/Servers/test/FunctionalTests/NtlmAuthentication.config diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs similarity index 85% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs rename to src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs index 0aff3407db..4050625d76 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs +++ b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs @@ -22,13 +22,8 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, "net461", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Portable)] @@ -37,7 +32,7 @@ namespace ServerComparison.FunctionalTests [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, - string targetFramework, + string targetFramework, RuntimeArchitecture architecture, ApplicationType applicationType, HostingModel hostingModel = HostingModel.OutOfProcess, @@ -48,7 +43,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "NtlmAuthentication.config", nginxConfig: null), diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/test/FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs rename to src/Servers/test/FunctionalTests/Properties/AssemblyInfo.cs diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs similarity index 79% rename from src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs rename to src/Servers/test/FunctionalTests/ResponseCompressionTests.cs index 301a0b74e6..b0e8d7cb9b 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs @@ -34,82 +34,70 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task ResponseCompression_IISExpress_NoCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckNoCompressionAsync, + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckNoCompressionAsync, applicationType, - hostCompression: false, - hostingModel: hostingModel, + hostCompression: false, + hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); } [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task ResponseCompression_IISExpress_HostCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckHostCompressionAsync, + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckHostCompressionAsync, applicationType, - hostCompression: true, - hostingModel: hostingModel, + hostCompression: true, + hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); } - [ConditionalTheory(Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - public Task ResponseCompression_IISExpress_AppCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) - { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckAppCompressionAsync, - applicationType, - hostCompression: true, - hostingModel: hostingModel, - additionalPublishParameters: additionalPublishParameters); - } - - [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + public Task ResponseCompression_IISExpress_AppCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) + { + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckAppCompressionAsync, + applicationType, + hostCompression: true, + hostingModel: hostingModel, + additionalPublishParameters: additionalPublishParameters); + } + + + [ConditionalTheory] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task ResponseCompression_IISExpress_AppAndHostCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckAppCompressionAsync, + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckAppCompressionAsync, applicationType, - hostCompression: true, - hostingModel: hostingModel, - additionalPublishParameters: additionalPublishParameters); + hostCompression: true, + hostingModel: hostingModel, + additionalPublishParameters: additionalPublishParameters); } // WebListener @@ -135,7 +123,7 @@ namespace ServerComparison.FunctionalTests { return ResponseCompression(ServerType.WebListener, runtimeFlavor, RuntimeArchitecture.x64, CheckAppCompressionAsync, applicationType, hostCompression: false); } - + [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable)] @@ -162,7 +150,7 @@ namespace ServerComparison.FunctionalTests { return ResponseCompression(serverType, runtimeFlavor, architecture, CheckAppCompressionAsync, applicationType, hostCompression: false); } - + // Nginx [ConditionalTheory] [OSSkipCondition(OperatingSystems.Windows)] @@ -201,11 +189,11 @@ namespace ServerComparison.FunctionalTests } private async Task ResponseCompression(ServerType serverType, - RuntimeFlavor runtimeFlavor, - RuntimeArchitecture architecture, - Func scenario, - ApplicationType applicationType, - bool hostCompression, + RuntimeFlavor runtimeFlavor, + RuntimeArchitecture architecture, + Func scenario, + ApplicationType applicationType, + bool hostCompression, [CallerMemberName] string testName = null, HostingModel hostingModel = HostingModel.OutOfProcess, string additionalPublishParameters = "") @@ -215,7 +203,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("ResponseCompression"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "ResponseCompression", ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs b/src/Servers/test/FunctionalTests/ResponseTests.cs similarity index 93% rename from src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs rename to src/Servers/test/FunctionalTests/ResponseTests.cs index 62d7fec6e3..ad616310b8 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseTests.cs @@ -27,11 +27,9 @@ namespace ServerComparison.FunctionalTests // IIS Express [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] public Task ResponseFormats_IISExpress_ContentLength(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return ResponseFormats(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, CheckContentLengthAsync, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); @@ -39,11 +37,9 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] public Task ResponseFormats_IISExpress_Chunked(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return ResponseFormats(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, CheckChunkedAsync, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); @@ -51,16 +47,14 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] public Task ResponseFormats_IIS_ManuallyChunk(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return ResponseFormats(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, CheckManuallyChunkedAsync, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); } - + // Weblistener [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] @@ -104,7 +98,7 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.WebListener, runtimeFlavor, RuntimeArchitecture.x64, CheckHttp11ConnectionCloseAsync, applicationType); } - + [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable)] @@ -149,7 +143,7 @@ namespace ServerComparison.FunctionalTests { return ResponseFormats(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, CheckHttp11ConnectionCloseAsync, applicationType); } - + [Theory] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] @@ -157,7 +151,7 @@ namespace ServerComparison.FunctionalTests { return ResponseFormats(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, CheckChunkedAsync, applicationType); } - + [Theory] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] @@ -174,7 +168,7 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, CheckManuallyChunkedAndCloseAsync, applicationType); } - // Nginx + // Nginx [ConditionalTheory] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] @@ -204,11 +198,11 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.Nginx, runtimeFlavor, RuntimeArchitecture.x64, CheckManuallyChunkedAsync, applicationType); } - private async Task ResponseFormats(ServerType serverType, - RuntimeFlavor runtimeFlavor, + private async Task ResponseFormats(ServerType serverType, + RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, - Func scenario, - ApplicationType applicationType, + Func scenario, + ApplicationType applicationType, [CallerMemberName] string testName = null, HostingModel hostingModel = HostingModel.OutOfProcess, string additionalPublishParameters = "") @@ -218,7 +212,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("ResponseFormats"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "Responses", ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"), diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj new file mode 100644 index 0000000000..0ba6d8dd9b --- /dev/null +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -0,0 +1,26 @@ + + + + + netcoreapp2.1 + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/nginx.conf b/src/Servers/test/FunctionalTests/nginx.conf similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/nginx.conf rename to src/Servers/test/FunctionalTests/nginx.conf diff --git a/src/ServerTests/test/ServerComparison.TestSites/Program.cs b/src/Servers/testassets/TestSites/Program.cs similarity index 99% rename from src/ServerTests/test/ServerComparison.TestSites/Program.cs rename to src/Servers/testassets/TestSites/Program.cs index f6ae1163c1..af292d5d78 100644 --- a/src/ServerTests/test/ServerComparison.TestSites/Program.cs +++ b/src/Servers/testassets/TestSites/Program.cs @@ -53,7 +53,7 @@ namespace ServerComparison.TestSites // Check that we are not using IIS inproc before we add Kestrel. builder.UseKestrel(); } - + builder.UseIISIntegration(); var host = builder.Build(); diff --git a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj new file mode 100644 index 0000000000..759a75b222 --- /dev/null +++ b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp2.1;netcoreapp2.0;net461 + win7-x86;win7-x64;linux-x64;osx-x64 + + + + + + + + + + + + + + + + + + + diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupHelloWorld.cs b/src/Servers/testassets/TestSites/StartupHelloWorld.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupHelloWorld.cs rename to src/Servers/testassets/TestSites/StartupHelloWorld.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs b/src/Servers/testassets/TestSites/StartupNtlmAuthentication.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs rename to src/Servers/testassets/TestSites/StartupNtlmAuthentication.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupResponseCompression.cs b/src/Servers/testassets/TestSites/StartupResponseCompression.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupResponseCompression.cs rename to src/Servers/testassets/TestSites/StartupResponseCompression.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupResponses.cs b/src/Servers/testassets/TestSites/StartupResponses.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupResponses.cs rename to src/Servers/testassets/TestSites/StartupResponses.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/web.config b/src/Servers/testassets/TestSites/web.config similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/web.config rename to src/Servers/testassets/TestSites/web.config