diff --git a/Directory.Build.props b/Directory.Build.props index eac6ac92f3..212047ce95 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -92,7 +92,6 @@ - netcoreapp2.2;net461 $(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 7f7ee6f701..44380e29e8 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.2 net461 diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj b/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj index f6015f9815..535b2c80da 100644 --- a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj +++ b/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index d657e5bfe9..8fa4427f91 100644 --- a/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -2,15 +2,9 @@ netcoreapp2.2 + AnyCPU - - - - AnyCPU - - - diff --git a/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs index 1555325f0b..faf317fffa 100644 --- a/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs +++ b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs @@ -17,19 +17,10 @@ namespace ApplicationInsightsJavaScriptSnippetTest { } - [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] - public Task ScriptIsInjected_ForNetCoreApp20_Standalone() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.0", ApplicationType.Standalone); - - [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] - public Task ScriptIsInjected_ForNetCoreApp20_Portable() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.0", ApplicationType.Portable); - - [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] - public Task ScriptIsInjected_ForNetCoreApp21_Standalone() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.1", ApplicationType.Standalone); - - [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] - public Task ScriptIsInjected_ForNetCoreApp21_Portable() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.1", ApplicationType.Portable); - - private async Task JavaScriptSnippetInjectionTestSuite(string targetFramework, ApplicationType applicationType) + [Theory] + [InlineData(ApplicationType.Portable)] + [InlineData(ApplicationType.Standalone)] + public async Task JavaScriptSnippetInjectionTestSuite(ApplicationType applicationType) { var testName = $"ApplicationInsightsJavaScriptSnippetTest_{applicationType}"; using (StartLog(out var loggerFactory, testName)) @@ -39,7 +30,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest { PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = PreservePublishedApplicationForDebugging, - TargetFramework = targetFramework, + TargetFramework = "netcoreapp2.2", Configuration = GetCurrentBuildConfiguration(), ApplicationType = applicationType, EnvironmentName = "JavaScript", diff --git a/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs index 22c558dc09..f8e15b7d16 100644 --- a/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs +++ b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs @@ -17,21 +17,12 @@ namespace ApplicationInsightsJavaScriptSnippetTest { } - [Fact] - public Task DefaultAILogFiltersApplied_ForNetCoreApp20_Portable() => DefaultAILogFiltersApplied("netcoreapp2.0", ApplicationType.Portable); - - [Fact] - public Task DefaultAILogFiltersApplied_ForNetCoreApp20_Standalone() => DefaultAILogFiltersApplied("netcoreapp2.0", ApplicationType.Standalone); - - [Fact] - public Task DefaultAILogFiltersApplied_ForNetCoreApp21_Portable() => DefaultAILogFiltersApplied("netcoreapp2.1", ApplicationType.Portable); - - [Fact] - public Task DefaultAILogFiltersApplied_ForNetCoreApp21_Standalone() => DefaultAILogFiltersApplied("netcoreapp2.1", ApplicationType.Standalone); - - private async Task DefaultAILogFiltersApplied(string targetFramework, ApplicationType applicationType) + [Theory] + [InlineData(ApplicationType.Portable)] + [InlineData(ApplicationType.Standalone)] + public async Task DefaultAILogFiltersApplied(ApplicationType applicationType) { - var responseText = await RunRequest(targetFramework, applicationType, "DefaultLogging"); + var responseText = await RunRequest(applicationType, "DefaultLogging"); // Enabled by default Assert.Contains("System warning log", responseText); @@ -62,21 +53,12 @@ namespace ApplicationInsightsJavaScriptSnippetTest Assert.Contains("Specific trace log", responseText); } - [Fact] - public Task CustomAILogFiltersApplied_ForNetCoreApp20_Portable() => CustomAILogFiltersApplied("netcoreapp2.0", ApplicationType.Portable); - - [Fact] - public Task CustomAILogFiltersApplied_ForNetCoreApp20_Standalone() => CustomAILogFiltersApplied("netcoreapp2.0", ApplicationType.Standalone); - - [Fact] - public Task CustomAILogFiltersApplied_ForNetCoreApp21_Portable() => CustomAILogFiltersApplied("netcoreapp2.1", ApplicationType.Portable); - - [Fact] - public Task CustomAILogFiltersApplied_ForNetCoreApp21_Standalone() => CustomAILogFiltersApplied("netcoreapp2.1", ApplicationType.Standalone); - - private async Task CustomAILogFiltersApplied(string targetFramework, ApplicationType applicationType) + [Theory] + [InlineData(ApplicationType.Portable)] + [InlineData(ApplicationType.Standalone)] + public async Task CustomAILogFiltersApplied(ApplicationType applicationType) { - var responseText = await RunRequest(targetFramework, applicationType, "CustomLogging"); + var responseText = await RunRequest(applicationType, "CustomLogging"); // Custom logger allows only namespaces with 'o' in the name Assert.DoesNotContain("System warning log", responseText); @@ -99,7 +81,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest Assert.DoesNotContain("Specific trace log", responseText); } - private async Task RunRequest(string targetFramework, ApplicationType applicationType, string environment) + private async Task RunRequest(ApplicationType applicationType, string environment) { string responseText; var testName = $"ApplicationInsightsLoggingTest_{applicationType}"; @@ -111,7 +93,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest { PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = PreservePublishedApplicationForDebugging, - TargetFramework = "netcoreapp2.0", + TargetFramework = "netcoreapp2.2", Configuration = GetCurrentBuildConfiguration(), ApplicationType = applicationType, EnvironmentName = environment, diff --git a/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj index 98c2da2105..649e3fe863 100644 --- a/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj +++ b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.2;net461 win7-x86;win7-x64;linux-x64;osx-x64 diff --git a/src/AzureIntegration/test/Directory.Build.props b/src/AzureIntegration/test/Directory.Build.props index 50ca1281a2..ea16aae9bf 100644 --- a/src/AzureIntegration/test/Directory.Build.props +++ b/src/AzureIntegration/test/Directory.Build.props @@ -1,13 +1,6 @@ - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - - $(StandardTestTfms);net461 - - diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index a36f80c0fd..d32405b95d 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 true diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 1be0002b9c..11fe2786df 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index d6d23b46db..6737687eb7 100644 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj index dcb8b19d66..899d338499 100644 --- a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj +++ b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj index 30d83a5f12..c8e5347e6a 100644 --- a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj +++ b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj b/src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj index c9c14a564d..0d13ccf3a7 100644 --- a/src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj +++ b/src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj index 887781fd92..897d8e14b7 100644 --- a/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj +++ b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 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..e8e034f261 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) + netcoreapp2.2;net461 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..6be8d82000 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) + netcoreapp2.2;net461 diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj index f581883ab8..375ea574bf 100644 --- a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj +++ b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 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..5d7a64c86f 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) + netcoreapp2.2;net461 - + - + diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj b/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj index 0523f91842..cb7d958ce7 100644 --- a/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj +++ b/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 Microsoft.AspNetCore.Diagnostics.HealthChecks 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..8e6c38f6d6 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) + netcoreapp2.2;net461 Microsoft.AspNetCore.Diagnostics.HealthChecks diff --git a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj index dfe8ded9f5..85fa09a3d0 100644 --- a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj +++ b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index eeef37e17e..5df742174a 100644 --- a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj index 80a9169649..def8cf36af 100644 --- a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj +++ b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.2;net461 diff --git a/src/Middleware/Localization.Routing/test/Microsoft.AspNetCore.Localization.Routing.Tests.csproj b/src/Middleware/Localization.Routing/test/Microsoft.AspNetCore.Localization.Routing.Tests.csproj index aa56ca5132..a9056630e6 100644 --- a/src/Middleware/Localization.Routing/test/Microsoft.AspNetCore.Localization.Routing.Tests.csproj +++ b/src/Middleware/Localization.Routing/test/Microsoft.AspNetCore.Localization.Routing.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/Localization/test/FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj b/src/Middleware/Localization/test/FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj index d3d14f4474..07ca71f163 100644 --- a/src/Middleware/Localization/test/FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj +++ b/src/Middleware/Localization/test/FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/Localization/test/UnitTests/Microsoft.AspNetCore.Localization.Tests.csproj b/src/Middleware/Localization/test/UnitTests/Microsoft.AspNetCore.Localization.Tests.csproj index 8a0fb85de7..8f11a13c38 100644 --- a/src/Middleware/Localization/test/UnitTests/Microsoft.AspNetCore.Localization.Tests.csproj +++ b/src/Middleware/Localization/test/UnitTests/Microsoft.AspNetCore.Localization.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj b/src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj index 409af955a7..b8f6140305 100644 --- a/src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj +++ b/src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0;net461 + netcoreapp2.2;net461 diff --git a/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj index 1c74cf4f78..0b13b40280 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) + netcoreapp2.2;net461 diff --git a/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj b/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj index 61dbf5e5a3..61ba66df1b 100644 --- a/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj +++ b/src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj index cce4750f61..1e56872b36 100644 --- a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj +++ b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj index 87bf4497b5..9f79e1e530 100644 --- a/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj +++ b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj b/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj index 4c3e5f7420..1ebb9fa988 100644 --- a/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj +++ b/src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index 713f84ee22..96e7be38ab 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 - - - netcoreapp2.2 - $(DeveloperBuildTestWebsiteTfms) - netcoreapp2.2 - $(StandardTestWebsiteTfms);net461 - diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj index c34f7d787c..31f5683361 100644 --- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj +++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 full false diff --git a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj index 7ef6adc56d..aac211f478 100644 --- a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj +++ b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 false true diff --git a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj index e058430689..967f00a858 100644 --- a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj +++ b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj index d05aa847d8..5245469a33 100644 --- a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj +++ b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj index 546722c75e..122fa1997b 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj index 5852d7d33c..0996e24934 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 $(DefineConstants) true diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj index 5852d7d33c..0996e24934 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 $(DefineConstants) true diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj index 2e041a5844..c0c2643eae 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 $(DefineConstants) false diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj index 9bf21a8adf..a73abb4f39 100644 --- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj index f935ea836a..acb90b34b0 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 $(DefineConstants);NETCOREAPP2_0_CUSTOM_DEFINE true diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj index cb955eae36..1f4f19e625 100644 --- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj +++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj index 282bdd5db7..fd66857b2b 100644 --- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj +++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj index 701d552c4a..a4c77a8fb2 100644 --- a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj +++ b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index 0148e59a14..b837ded498 100644 --- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true true diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj index 5e686352ea..76ce51ebcf 100644 --- a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj +++ b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj index 8165cb031c..28b7bcac55 100644 --- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj +++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj index eb218807a1..7476816add 100644 --- a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj +++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj @@ -1,6 +1,6 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.2;net461 true diff --git a/src/MvcPrecompilation/test/Directory.Build.props b/src/MvcPrecompilation/test/Directory.Build.props index bf1f6628de..c79812719a 100644 --- a/src/MvcPrecompilation/test/Directory.Build.props +++ b/src/MvcPrecompilation/test/Directory.Build.props @@ -1,13 +1,6 @@ - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - - $(StandardTestTfms);net461 - - diff --git a/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj b/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj index a0c5f23b91..bbdd3ee260 100644 --- a/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj +++ b/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 $(DefineConstants);__remove_this_to__GENERATE_BASELINES $(DefineConstants);GENERATE_BASELINES diff --git a/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj b/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj index 06337dac6a..999d2a6566 100644 --- a/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj +++ b/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj index 26ecdd3795..99da07d564 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 $(DefineConstants);TEST123 true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj index c9b9f513ff..425456b939 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 true true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj index 91b6481522..e11d8f67ce 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj index 97c4916e21..edbbb49660 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 win7-x64 diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj index ce7ce79715..bd4eaa455f 100644 --- a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj +++ b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 true true diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj b/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj index f2eb5223ff..13f7c98fbc 100644 --- a/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj +++ b/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 true diff --git a/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj b/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj index f330f2386d..a21d276219 100644 --- a/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj +++ b/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 true diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj index 73de429042..907453bfb4 100644 --- a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj +++ b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj @@ -2,7 +2,7 @@ NewAssemblyName - $(StandardTestAppTfms) + netcoreapp2.2;net461 true diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj b/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj index f76a4cc9f4..8801edd786 100644 --- a/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj +++ b/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.2;net461 true true diff --git a/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj b/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj index fba5eeee24..436fdd7068 100644 --- a/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj +++ b/src/Razor/CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 $(DefaultItemExcludes);TestFiles\**\* true diff --git a/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj index 236731665b..91a67ddcdc 100644 --- a/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj +++ b/src/Razor/Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 true $(DefaultItemExcludes);TestFiles\** diff --git a/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj index 1925c61e4b..c97de74ec3 100644 --- a/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj +++ b/src/Razor/Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 true $(DefaultItemExcludes);TestFiles\** diff --git a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj index 746fa354fc..6eb553cda2 100644 --- a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -1,9 +1,7 @@ - + netcoreapp2.2;net46 - $(TargetFrameworks) - $(TargetFrameworks);net46 $(DefaultItemExcludes);TestFiles\**\* $(DefineConstants);GENERATE_BASELINES diff --git a/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj index f7c41bfcd5..290e0c96db 100644 --- a/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj +++ b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 $(DefaultItemExcludes);TestFiles\**\* diff --git a/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj index 04e4b086cb..50c663f207 100644 --- a/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj +++ b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 $(DefaultItemExcludes);TestFiles\**\* diff --git a/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj b/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj index 795814b649..edd6cae6f7 100644 --- a/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj +++ b/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 diff --git a/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj b/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj index 6966acf3b3..042d0d8be8 100644 --- a/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj +++ b/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 diff --git a/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj index d76de243da..dd4d3d9ed3 100644 --- a/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj +++ b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 aspnet5-JwtBearerSample-20151210102827 diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj index 724448ab8b..379af9ce41 100644 --- a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj +++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 aspnet5-OpenIdConnectSample-20151210110318 diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj index 6b34fabc6c..39d1a8055c 100644 --- a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj +++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 aspnet5-OpenIdConnectSample-20151210110318 diff --git a/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj b/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj index 684f104da1..26f51963cd 100644 --- a/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj +++ b/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 diff --git a/src/Security/Authentication/samples/SocialSample/SocialSample.csproj b/src/Security/Authentication/samples/SocialSample/SocialSample.csproj index 701d5b93f7..cce4675916 100644 --- a/src/Security/Authentication/samples/SocialSample/SocialSample.csproj +++ b/src/Security/Authentication/samples/SocialSample/SocialSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 aspnet5-SocialSample-20151210111056 diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj index 7aa4ec1806..922a7843e5 100644 --- a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj +++ b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj index 7e393358d3..ebd47527c7 100644 --- a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj +++ b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj b/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj index 4601ca63ba..28e2417827 100644 --- a/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj +++ b/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1 + net461;netcoreapp2.2 diff --git a/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj index 03540dd92d..0eb3303ede 100644 --- a/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj +++ b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 43c2b459fe..20baaf2ada 100644 --- a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -3,7 +3,7 @@ - $(StandardTestTfms) + netcoreapp2.2;net461 @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj index 934cfb2991..03c89dfef6 100644 --- a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj @@ -3,7 +3,7 @@ - $(StandardTestTfms) + netcoreapp2.2;net461 true diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj index 2f3ff3479f..09b2e0eee8 100644 --- a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj +++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj @@ -2,7 +2,7 @@ Exe - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj index 6567415b2f..e91a04c929 100644 --- a/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/README.md b/src/Servers/Kestrel/perf/Kestrel.Performance/README.md index 47ff9b906d..af5618909b 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/README.md +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/README.md @@ -4,10 +4,10 @@ build /t:compile /p:Configuration=Release ``` To run a specific benchmark add it as parameter ``` -dotnet run -f netcoreapp2.1 -c Release RequestParsing +dotnet run -f netcoreapp2.2 -c Release RequestParsing ``` To run all use `All` as parameter ``` -dotnet run -f netcoreapp2.1 -c Release All +dotnet run -f netcoreapp2.2 -c Release All ``` Using no parameter will list all available benchmarks diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index bd7a55e7db..ab1ac1199a 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -3,7 +3,7 @@ - $(StandardTestTfms) + netcoreapp2.2;net461 win7-x86;win7-x64;linux-x64;osx-x64 true diff --git a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj index 7746780816..9c0dd69015 100644 --- a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj +++ b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp2.2 false Exe diff --git a/src/SignalR/test/Directory.Build.props b/src/SignalR/test/Directory.Build.props index dfd1b2c370..ae9c6b5322 100644 --- a/src/SignalR/test/Directory.Build.props +++ b/src/SignalR/test/Directory.Build.props @@ -2,9 +2,6 @@ - netcoreapp2.2 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);net461 win7-x86 diff --git a/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj index e50d6131ab..e6ab513627 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 win7-x86 diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj index bc1254feac..4335eb6b51 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index 43229b1bea..8d157804f5 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj index 39827c10d7..1a8439ce84 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Common.Tests/Microsoft.AspNetCore.SignalR.Common.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj index 24d6cebb93..904119c783 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj index ef017f8ba8..3c697cf74e 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj index 976041ab7c..0a65aa5a9c 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461 Microsoft.AspNetCore.SignalR.Tests $(DefineConstants);TESTUTILS diff --git a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj index 0796e5430a..0c5b0b7536 100644 --- a/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/src/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2;net461