diff --git a/src/ServerTests/Directory.Build.targets b/src/ServerTests/Directory.Build.targets index 78626b773e..7a09b207eb 100644 --- a/src/ServerTests/Directory.Build.targets +++ b/src/ServerTests/Directory.Build.targets @@ -1,10 +1,5 @@ - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 + $(MicrosoftNETCoreAppPackageVersion) diff --git a/src/ServerTests/README.md b/src/ServerTests/README.md index 355a989132..c992a6e241 100644 --- a/src/ServerTests/README.md +++ b/src/ServerTests/README.md @@ -1,9 +1,8 @@ -Server Tests -============ +Server Tests [Archived] +======================= -[![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 GitHub project has been archived.** Ongoing development on this project can be found in . 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. +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/ServerTests/build/dependencies.props b/src/ServerTests/build/dependencies.props index ff465aacf2..04df341118 100644 --- a/src/ServerTests/build/dependencies.props +++ b/src/ServerTests/build/dependencies.props @@ -3,32 +3,29 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview2-20181004.6 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.0.9 - 2.1.3 - 2.2.0-preview3-27001-02 - 2.2.0-preview3-35425 + 3.0.0-build-20181114.5 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.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-preview1-26907-05 + 3.0.0-alpha1-10742 15.6.1 - 2.0.3 1.4.0 4.0.0 2.3.1 2.4.0 - + diff --git a/src/ServerTests/build/repo.props b/src/ServerTests/build/repo.props index 731c06d415..164db6503f 100644 --- a/src/ServerTests/build/repo.props +++ b/src/ServerTests/build/repo.props @@ -1,18 +1,14 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - + + diff --git a/src/ServerTests/test/test/Directory.Build.props b/src/ServerTests/test/test/Directory.Build.props deleted file mode 100644 index a0100197c9..0000000000 --- a/src/ServerTests/test/test/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);net461 - - diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/src/ServerTests/test/test/ServerComparison.FunctionalTests/HelloWorldTest.cs index 4575a7f370..a23952e86e 100644 --- a/src/ServerTests/test/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/src/ServerTests/test/test/ServerComparison.FunctionalTests/HelloWorldTest.cs @@ -21,7 +21,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels() @@ -32,7 +32,9 @@ namespace ServerComparison.FunctionalTests public async Task HelloWorld(TestVariant variant) { var testName = $"HelloWorld_{variant.Server}_{variant.Tfm}_{variant.Architecture}_{variant.ApplicationType}"; - using (StartLog(out var loggerFactory, testName)) + using (StartLog(out var loggerFactory, + variant.Server == ServerType.Nginx ? LogLevel.Trace : LogLevel.Debug, // https://github.com/aspnet/ServerTests/issues/144 + testName)) { var logger = loggerFactory.CreateLogger("HelloWorld"); diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs b/src/ServerTests/test/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs index 7d47162591..d64e16ada0 100644 --- a/src/ServerTests/test/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs +++ b/src/ServerTests/test/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs @@ -22,7 +22,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs b/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs index 283f8286b2..e654d13d86 100644 --- a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs +++ b/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs @@ -33,7 +33,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix NoCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); @@ -46,7 +46,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix HostCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Nginx) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); @@ -59,7 +59,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix AppCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) // No pass-through compression for nginx - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); @@ -72,7 +72,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix HostAndAppCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); @@ -89,7 +89,9 @@ namespace ServerComparison.FunctionalTests [CallerMemberName] string testName = null) { testName = $"{testName}_{variant.Server}_{variant.Tfm}_{variant.Architecture}_{variant.ApplicationType}"; - using (StartLog(out var loggerFactory, testName)) + using (StartLog(out var loggerFactory, + variant.Server == ServerType.Nginx ? LogLevel.Trace : LogLevel.Debug, // https://github.com/aspnet/ServerTests/issues/144 + testName)) { var logger = loggerFactory.CreateLogger("ResponseCompression"); diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseTests.cs b/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseTests.cs index 72ef1f6d48..33aeb659de 100644 --- a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseTests.cs +++ b/src/ServerTests/test/test/ServerComparison.FunctionalTests/ResponseTests.cs @@ -26,7 +26,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22) + .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); @@ -53,7 +53,7 @@ namespace ServerComparison.FunctionalTests public static TestMatrix SelfhostTestVariants => TestMatrix.ForServers(ServerType.Kestrel, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp22); + .WithTfms(Tfm.NetCoreApp30); // Connection Close tests do not work through reverse proxies [ConditionalTheory] @@ -80,7 +80,9 @@ namespace ServerComparison.FunctionalTests private async Task ResponseFormats(TestVariant variant, Func scenario, [CallerMemberName] string testName = null) { testName = $"{testName}_{variant.Server}_{variant.Tfm}_{variant.Architecture}_{variant.ApplicationType}"; - using (StartLog(out var loggerFactory, testName)) + using (StartLog(out var loggerFactory, + variant.Server == ServerType.Nginx ? LogLevel.Trace : LogLevel.Debug, // https://github.com/aspnet/ServerTests/issues/144 + testName)) { var logger = loggerFactory.CreateLogger("ResponseFormats"); diff --git a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/ServerTests/test/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj index 54b15b9c07..804152d589 100644 --- a/src/ServerTests/test/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/ServerTests/test/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -1,8 +1,7 @@ - - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/ServerTests/test/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/ServerTests/test/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj index c58b620932..1e9df504e6 100644 --- a/src/ServerTests/test/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/ServerTests/test/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 win7-x86;win7-x64;linux-x64;osx-x64 diff --git a/src/ServerTests/version.props b/src/ServerTests/version.props index 098795ebd2..71a78cddd8 100644 --- a/src/ServerTests/version.props +++ b/src/ServerTests/version.props @@ -1,7 +1,7 @@  - 2.2.0 - rtm + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000