diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj index a82ac7c490..c9487cb44e 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 Diagnostics.EFCore.FunctionalTests diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj index fc5a2b350f..1167b5912f 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj index f581883ab8..6c283cbff9 100644 --- a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj +++ b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 false Diagnostics.FunctionalTests diff --git a/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj index 5c37cdf8c4..fa16f825dc 100644 --- a/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj +++ b/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -1,18 +1,18 @@  - $(StandardTestTfms) + netcoreapp3.0 - + - + diff --git a/src/Middleware/HealthChecks/test/UnitTests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj b/src/Middleware/HealthChecks/test/UnitTests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj index ec431460cc..6cad65db2b 100644 --- a/src/Middleware/HealthChecks/test/UnitTests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj +++ b/src/Middleware/HealthChecks/test/UnitTests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 Microsoft.AspNetCore.Diagnostics.HealthChecks diff --git a/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj index 1c74cf4f78..ebc3c153e7 100644 --- a/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj +++ b/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Middleware/WebSockets/samples/EchoApp/EchoApp.csproj b/src/Middleware/WebSockets/samples/EchoApp/EchoApp.csproj index 7ea4ba53b0..0b821199f6 100644 --- a/src/Middleware/WebSockets/samples/EchoApp/EchoApp.csproj +++ b/src/Middleware/WebSockets/samples/EchoApp/EchoApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2;net461 + netcoreapp3.0 diff --git a/src/Middleware/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj b/src/Middleware/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj index 43595a6d8c..ee6c43d6d2 100644 --- a/src/Middleware/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj +++ b/src/Middleware/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 true diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs index 4eb5ee177e..05b1d55ee1 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs +++ b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs @@ -135,17 +135,11 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn var appPath = Helpers.GetApplicationPath("AutobahnTestApp"); var configPath = Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "Http.config"); - var targetFramework = -#if NETCOREAPP2_2 - "netcoreapp2.2"; -#else -#error Target frameworks need to be updated -#endif var parameters = new DeploymentParameters(appPath, server, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp), ApplicationType = ApplicationType.Portable, - TargetFramework = targetFramework, + TargetFramework = "netcoreapp3.0", EnvironmentName = environment, SiteName = "HttpTestSite", // This is configured in the Http.config ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null, diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj index 13e075308f..af7648921a 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj +++ b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj index fc5fb268d5..428fc49b8f 100644 --- a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj +++ b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs b/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs index 116877df61..4bf1e58c30 100644 --- a/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs +++ b/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs @@ -15,17 +15,9 @@ using Xunit; namespace Microsoft.AspNetCore.WebSockets.Test { -#if NET461 - // ClientWebSocket does not support WebSockets on these platforms and OS. Kestrel does support it. - [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No WebSockets Client for this platform")] -#elif NETCOREAPP2_2 - // ClientWebSocket has added support for WebSockets on Win7. -#else -#error Unknown TFM -#endif public class WebSocketMiddlewareTests : LoggedTest { - [ConditionalFact] + [Fact] public async Task Connect_Success() { using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, async context => @@ -41,7 +33,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task NegotiateSubProtocol_Success() { using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, async context => @@ -69,7 +61,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task SendEmptyData_Success() { using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, async context => @@ -93,7 +85,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task SendShortData_Success() { var orriginalData = Encoding.UTF8.GetBytes("Hello World"); @@ -118,7 +110,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task SendMediumData_Success() { var orriginalData = Encoding.UTF8.GetBytes(new string('a', 130)); @@ -143,7 +135,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task SendLongData_Success() { var orriginalData = Encoding.UTF8.GetBytes(new string('a', 0x1FFFF)); @@ -180,7 +172,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task SendFragmentedData_Success() { var orriginalData = Encoding.UTF8.GetBytes("Hello World"); @@ -223,7 +215,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task ReceiveShortData_Success() { var orriginalData = Encoding.UTF8.GetBytes("Hello World"); @@ -248,7 +240,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task ReceiveMediumData_Success() { var orriginalData = Encoding.UTF8.GetBytes(new string('a', 130)); @@ -273,7 +265,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task ReceiveLongData() { var orriginalData = Encoding.UTF8.GetBytes(new string('a', 0x1FFFF)); @@ -306,7 +298,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task ReceiveFragmentedData_Success() { var orriginalData = Encoding.UTF8.GetBytes("Hello World"); @@ -349,7 +341,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task SendClose_Success() { string closeDescription = "Test Closed"; @@ -377,7 +369,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task ReceiveClose_Success() { string closeDescription = "Test Closed"; @@ -405,7 +397,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task CloseFromOpen_Success() { string closeDescription = "Test Closed"; @@ -435,7 +427,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task CloseFromCloseSent_Success() { string closeDescription = "Test Closed"; @@ -467,7 +459,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test } } - [ConditionalFact] + [Fact] public async Task CloseFromCloseReceived_Success() { string closeDescription = "Test Closed";