diff --git a/Directory.Build.props b/Directory.Build.props index 8199c65d62..4de102651c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -38,7 +38,6 @@ - netcoreapp2.1;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..0b7fe229f0 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -2,7 +2,7 @@ - netcoreapp2.0 + netcoreapp2.1 net461 diff --git a/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj b/src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj index f6015f9815..a2d17575d3 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.1;net461 diff --git a/src/AuthSamples/samples/ClaimsTransformation/ClaimsTransformation.csproj b/src/AuthSamples/samples/ClaimsTransformation/ClaimsTransformation.csproj index 2b505a6c4c..e328fafb00 100644 --- a/src/AuthSamples/samples/ClaimsTransformation/ClaimsTransformation.csproj +++ b/src/AuthSamples/samples/ClaimsTransformation/ClaimsTransformation.csproj @@ -2,7 +2,7 @@ false - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.1 diff --git a/src/AuthSamples/samples/Cookies/Cookies.csproj b/src/AuthSamples/samples/Cookies/Cookies.csproj index 2b505a6c4c..e328fafb00 100644 --- a/src/AuthSamples/samples/Cookies/Cookies.csproj +++ b/src/AuthSamples/samples/Cookies/Cookies.csproj @@ -2,7 +2,7 @@ false - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.1 diff --git a/src/AuthSamples/samples/DynamicSchemes/DynamicSchemes.csproj b/src/AuthSamples/samples/DynamicSchemes/DynamicSchemes.csproj index e2868a989a..81a81d90d4 100644 --- a/src/AuthSamples/samples/DynamicSchemes/DynamicSchemes.csproj +++ b/src/AuthSamples/samples/DynamicSchemes/DynamicSchemes.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 diff --git a/src/AuthSamples/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/src/AuthSamples/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj index c244d5ea79..5444ac0470 100644 --- a/src/AuthSamples/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj +++ b/src/AuthSamples/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 aspnet-Identity.ExternalClaims-E95BE154-CB1B-4633-A2E0-B2DF12FE8BD3 diff --git a/src/AuthSamples/samples/PathSchemeSelection/PathSchemeSelection.csproj b/src/AuthSamples/samples/PathSchemeSelection/PathSchemeSelection.csproj index 92a95ea57d..8ca86081de 100644 --- a/src/AuthSamples/samples/PathSchemeSelection/PathSchemeSelection.csproj +++ b/src/AuthSamples/samples/PathSchemeSelection/PathSchemeSelection.csproj @@ -2,7 +2,7 @@ false - netcoreapp2.0 + netcoreapp2.1 diff --git a/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index da9025897e..ebafee8594 100644 --- a/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.1 diff --git a/src/AuthSamples/test/AuthSamples.FunctionalTests/TestServices.cs b/src/AuthSamples/test/AuthSamples.FunctionalTests/TestServices.cs index 129c218878..8050801554 100644 --- a/src/AuthSamples/test/AuthSamples.FunctionalTests/TestServices.cs +++ b/src/AuthSamples/test/AuthSamples.FunctionalTests/TestServices.cs @@ -44,13 +44,7 @@ namespace AuthSamples.FunctionalTests { var logger = loggerFactory.CreateLogger(siteName); var targetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : -#if NETCOREAPP2_0 - "netcoreapp2.0"; -#elif NETCOREAPP2_1 "netcoreapp2.1"; -#else -#error Target frameworks need to be updated. -#endif var deploymentParameters = new DeploymentParameters(GetApplicationDirectory(siteName), serverType, runtimeFlavor, architecture) { diff --git a/src/AuthSamples/test/Directory.Build.props b/src/AuthSamples/test/Directory.Build.props deleted file mode 100644 index 260c5c1249..0000000000 --- a/src/AuthSamples/test/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 - - diff --git a/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs index 1555325f0b..f467e4c50b 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.1", 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 348e072fd4..acd834e853 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}"; @@ -112,7 +94,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest ApplicationBaseUriHint = "http://localhost:0", PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = PreservePublishedApplicationForDebugging, - TargetFramework = "netcoreapp2.0", + TargetFramework = "netcoreapp2.1", 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 7eab7f389e..018c679399 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.1;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 a7f3c3cd79..ea16aae9bf 100644 --- a/src/AzureIntegration/test/Directory.Build.props +++ b/src/AzureIntegration/test/Directory.Build.props @@ -1,13 +1,6 @@ - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - diff --git a/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj b/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj index 6199bd2b24..1d202611f2 100644 --- a/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj +++ b/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 diff --git a/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj b/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj index 95a7d299fc..93b0753a60 100644 --- a/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj +++ b/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true diff --git a/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj b/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj index a8b6486901..c01bea99ff 100644 --- a/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj +++ b/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true diff --git a/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj b/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj index 9bc42b1842..b50a4a5685 100644 --- a/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj +++ b/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true diff --git a/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj b/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj index 46b39d41bd..e56e0f6229 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true diff --git a/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs b/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs index 6c78225a92..a38fe73466 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs +++ b/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation { #if NET461 -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 // The 'numBytesRequested' parameters below are chosen to exercise code paths where // this value straddles the digest length of the PRF. We only use 5 iterations so // that our unit tests are fast. diff --git a/src/DataProtection/DataProtection/test/AnonymousImpersonation.cs b/src/DataProtection/DataProtection/test/AnonymousImpersonation.cs index b8ecc36c26..f838698051 100644 --- a/src/DataProtection/DataProtection/test/AnonymousImpersonation.cs +++ b/src/DataProtection/DataProtection/test/AnonymousImpersonation.cs @@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.DataProtection } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj index 81986fba41..77a6ad9818 100644 --- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj +++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true diff --git a/src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs b/src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs index 251369b7cd..ca12469caa 100644 --- a/src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs +++ b/src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs @@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.DataProtection var domain = AppDomain.CreateDomain("TestDomain", null, setupInfo); var wrappedTestClass = (TypeForwardingActivatorTests)domain.CreateInstanceAndUnwrap(GetType().Assembly.FullName, typeof(TypeForwardingActivatorTests).FullName); wrappedTestClass.CreateInstance_ForwardsAcrossVersionChangesImpl(version); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 CreateInstance_ForwardsAcrossVersionChangesImpl(version); #else #error Target framework should be updated diff --git a/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs b/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs index 79dcff64af..88d29afacf 100644 --- a/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs +++ b/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.DataProtection.XmlEncryption ExceptionAssert2.ThrowsCryptographicException(() => AnonymousImpersonation.Run(() => decryptor.Decrypt(encryptedXmlInfo.EncryptedElement))); } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif diff --git a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj index da0be5fc69..0364314b5e 100644 --- a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj +++ b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 diff --git a/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj b/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj index 6bf56165bd..3f133e979a 100644 --- a/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj +++ b/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;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 ac104253eb..e7a81f44b9 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.1;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 bc988b37b2..53f6325cc6 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.1;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 7b3cb6a375..0da8e3cd3c 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.1;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 8f1b267e17..2b76456133 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.1;net461 diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj index a830e92e3e..789edabd04 100644 --- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D 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 04f022dcf7..250892b38a 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.1;net461 diff --git a/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj b/src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj index 12c5b3b0b4..db51feb3b2 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.1;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..c890441a3a 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.1;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..6019a716eb 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.1;net461 diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj index 13a082db5e..9a3791892c 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.1;net461 false false 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 3623c34990..e1f6e276e2 100644 --- a/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj +++ b/src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.1;net461 diff --git a/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj index 9f7630aedb..9320336fc8 100644 --- a/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj +++ b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0;netcoreapp2.1 + net461;netcoreapp2.1 diff --git a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj index 1bc19e49c5..64f36031fe 100644 --- a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj +++ b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0;netcoreapp2.1 + net461;netcoreapp2.1 diff --git a/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj index 7710795716..c5cea495a1 100644 --- a/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj +++ b/src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0;netcoreapp2.1 + net461;netcoreapp2.1 diff --git a/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj b/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj index 40481fde37..0053cd6b0b 100644 --- a/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj +++ b/src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0;netcoreapp2.1 + net461;netcoreapp2.1 diff --git a/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj b/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj index 40481fde37..0053cd6b0b 100644 --- a/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj +++ b/src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0;netcoreapp2.1 + net461;netcoreapp2.1 diff --git a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj index dfe8ded9f5..07cbdd5dc6 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.1;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..d6543e6f90 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.1;net461 diff --git a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj index 3bbe805f9f..67d1ecd307 100644 --- a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj +++ b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0 + net461;netcoreapp2.1 diff --git a/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj b/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj index c93a869b78..4b15b60625 100644 --- a/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj +++ b/src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj @@ -1,8 +1,7 @@  - netcoreapp2.1 - $(TargetFrameworks);netcoreapp2.0 + netcoreapp2.1 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..8b7a61ec96 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.1;net461 diff --git a/src/Middleware/Localization/sample/LocalizationSample.csproj b/src/Middleware/Localization/sample/LocalizationSample.csproj index 77b1172173..808bd9e6cd 100644 --- a/src/Middleware/Localization/sample/LocalizationSample.csproj +++ b/src/Middleware/Localization/sample/LocalizationSample.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;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..5dbeb8d855 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.1;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..065611b04c 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.1;net461 diff --git a/src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj b/src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj index 409af955a7..56b4b6582f 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.1;net461 diff --git a/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj b/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj index 31a5713044..b5693ac4bb 100644 --- a/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj +++ b/src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0;netcoreapp2.1 + net461;netcoreapp2.1 diff --git a/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj index 1c74cf4f78..07fe1b6f6c 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.1;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..f9b3845468 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.1;net461 diff --git a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj index 762a9a1ddd..736cf4376e 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.1;net461 diff --git a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs index 213a4c8fd7..20e3745de5 100644 --- a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs +++ b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs @@ -508,7 +508,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests #if NET461 // Flush not supported, compression disabled Assert.NotNull(response.Content.Headers.GetValues(HeaderNames.ContentMD5)); Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 // Flush supported, compression enabled +#elif NETCOREAPP2_1 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); @@ -573,7 +573,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests #if NET461 // Flush not supported, compression disabled Assert.NotNull(response.Content.Headers.GetValues(HeaderNames.ContentMD5)); Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 // Flush supported, compression enabled +#elif NETCOREAPP2_1 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); diff --git a/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj index 87bf4497b5..e4f88149f6 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.1;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..a9370ff48b 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.1;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..c859516b18 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.1;net461 - - - netcoreapp2.1 - $(DeveloperBuildTestWebsiteTfms) - netcoreapp2.1 - $(StandardTestWebsiteTfms);net461 - diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj index c34f7d787c..2a3c3b5bdc 100644 --- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj +++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 full false diff --git a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj index 7ef6adc56d..68f95c986b 100644 --- a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj +++ b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 false true diff --git a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj index e058430689..62ef1dcbbf 100644 --- a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj +++ b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj index d05aa847d8..0feb6f8da7 100644 --- a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj +++ b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj index 17fa586476..393592d1d6 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;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..70f3f22001 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.1;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..70f3f22001 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.1;net461 $(DefineConstants) true diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj index 40e5f7fe2e..2cea31cc81 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 $(DefineConstants) false diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj index 70d866adf8..b72d6d33d0 100644 --- a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj index fe22bad303..482c8d6f62 100644 --- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj index ea8f3aa271..be6ee3b5fe 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;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 17fa586476..393592d1d6 100644 --- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj +++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj index 4670064597..0ac6480bb5 100644 --- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj +++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj index 701d552c4a..a5dc541bc7 100644 --- a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj +++ b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index 0bb43dbc7c..366f6979aa 100644 --- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true true diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj index 17fa586476..393592d1d6 100644 --- a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj +++ b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj index 8165cb031c..da3565fcab 100644 --- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj +++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj index eb218807a1..fc2478a27f 100644 --- a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj +++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj @@ -1,6 +1,6 @@  - $(StandardTestWebsiteTfms) + netcoreapp2.1;net461 true diff --git a/src/MvcPrecompilation/test/Directory.Build.props b/src/MvcPrecompilation/test/Directory.Build.props index 7ec143f84d..c867cbd112 100644 --- a/src/MvcPrecompilation/test/Directory.Build.props +++ b/src/MvcPrecompilation/test/Directory.Build.props @@ -1,13 +1,6 @@  - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - diff --git a/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs b/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs index d429b08de1..97e0ee6d83 100644 --- a/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs +++ b/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs @@ -7,14 +7,7 @@ namespace FunctionalTests { public class CoreCLRApplicationTestFixture : ApplicationTestFixture { - private const string TargetFramework = -#if NETCOREAPP2_0 - "netcoreapp2.0"; -#elif NETCOREAPP2_1 - "netcoreapp2.1"; -#else -#error Target frameworks need to be updated -#endif + private const string TargetFramework = "netcoreapp2.1"; public CoreCLRApplicationTestFixture() : this(typeof(TStartup).Assembly.GetName().Name, null) diff --git a/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj b/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj index 93409efa46..14357e3edf 100644 --- a/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj +++ b/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.1;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..321b021bc6 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.1;net461 diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj b/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj index 91b6481522..5374844ba1 100644 --- a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj index 26ecdd3795..73a82f7d8c 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 $(DefineConstants);TEST123 true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj index c9b9f513ff..ee093ff56b 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 true true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj index 91b6481522..5374844ba1 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 true diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj index 97c4916e21..ed3be5e01e 100644 --- a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj +++ b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 1.0.0 diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj index ce7ce79715..c6ccf113dc 100644 --- a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj +++ b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 true true diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj b/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj index f2eb5223ff..3ab146c9bb 100644 --- a/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj +++ b/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 true diff --git a/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj b/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj index d484bc0298..725e3d45d0 100644 --- a/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj +++ b/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;net461 win7-x86;debian-x64 true diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj index 73de429042..8b879ca184 100644 --- a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj +++ b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj @@ -2,7 +2,7 @@ NewAssemblyName - $(StandardTestAppTfms) + netcoreapp2.1;net461 true diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj b/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj index b2d66d2953..c4df089b97 100644 --- a/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj +++ b/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj @@ -1,7 +1,7 @@  - $(StandardTestAppTfms) + netcoreapp2.1;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..cee221f42b 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.1;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 48fca9c7b2..93500880ff 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.1;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..de9e86c085 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.1;net461 true $(DefaultItemExcludes);TestFiles\** diff --git a/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/InitializeTestProjectAttribute.cs index 4500480c62..5ab0a04c31 100644 --- a/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/InitializeTestProjectAttribute.cs +++ b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/InitializeTestProjectAttribute.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests } MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language); - MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp2.0"; + MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp2.1"; } public override void After(MethodInfo methodUnderTest) diff --git a/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj index 3306e919a6..ed52a3b2b6 100644 --- a/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj +++ b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj @@ -1,13 +1,13 @@  - - netcoreapp2.0 + --> + netcoreapp2.1 true $(DefineConstants);PRESERVE_WORKING_DIRECTORY @@ -20,7 +20,7 @@ - + @@ -38,5 +38,5 @@ - + diff --git a/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj index 4228d70045..f5283bd66b 100644 --- a/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj +++ b/src/Razor/Razor.Design/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj @@ -12,7 +12,7 @@ - netcoreapp2.0 + netcoreapp2.1 diff --git a/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj index 48ae893ea9..805454a963 100644 --- a/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj +++ b/src/Razor/Razor.Design/test/testassets/SimpleMvc/SimpleMvc.csproj @@ -13,7 +13,7 @@ - netcoreapp2.0 + netcoreapp2.1 diff --git a/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj index 342bd6aa30..d1cfb7a3ab 100644 --- a/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj +++ b/src/Razor/Razor.Design/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj @@ -14,7 +14,7 @@ - netcoreapp2.0 + netcoreapp2.1 diff --git a/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj index 48ae893ea9..805454a963 100644 --- a/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj +++ b/src/Razor/Razor.Design/test/testassets/SimplePages/SimplePages.csproj @@ -13,7 +13,7 @@ - netcoreapp2.0 + netcoreapp2.1 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 9d6b0c33f8..d1946a6d9c 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 @@ -2,8 +2,6 @@ netcoreapp2.1;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..4c7365be03 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.1;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..e72f33e0ab 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.1;net461 $(DefaultItemExcludes);TestFiles\**\* diff --git a/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs index 0d6dd241ce..b07342e21a 100644 --- a/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs +++ b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests { CallContext.LogicalSetData("IntegrationTestBase_FileName", new ObjectHandle(value)); } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 get { return _fileName.Value; } set { _fileName.Value = value; } #endif diff --git a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj index 90658e3612..c385d2f085 100644 --- a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj @@ -4,7 +4,7 @@ $(DefineConstants);GENERATE_BASELINES $(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES - netcoreapp2.1;netcoreapp2.0;net46 + netcoreapp2.1;net46 true diff --git a/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj index 58509c2ad4..1c57297951 100644 --- a/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj +++ b/src/Razor/test/testassets/Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true true diff --git a/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj index 58509c2ad4..1c57297951 100644 --- a/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj +++ b/src/Razor/test/testassets/Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 true true diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj index 7aa4ec1806..d008f35ffd 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.1;net461 diff --git a/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs b/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs index a1e0233f3a..3a71ad7d7f 100644 --- a/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs +++ b/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs @@ -259,7 +259,7 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect ValidateParameter(OpenIdConnectParameterNames.State, ExpectedState, actualParams, errors, htmlEncoded); private void ValidateSkuTelemetry(IDictionary actualParams, ICollection errors, bool htmlEncoded) => -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NETSTANDARD1_4", actualParams, errors, htmlEncoded); #elif NET461 ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NET451", actualParams, errors, htmlEncoded); diff --git a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj index 7e393358d3..46d5e27562 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.1;net461 diff --git a/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj index 03540dd92d..cf7016dd3d 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.1;net461 diff --git a/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs b/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs index 06bc6f2c32..d7acefe4ea 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Empty(response.Headers.WwwAuthenticate); } } -#if !NETCOREAPP2_0 + // https://github.com/aspnet/ServerTests/issues/82 [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] @@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase); } } -#endif + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)] @@ -238,7 +238,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(HttpStatusCode.OK, response.StatusCode); } } -#if !NETCOREAPP2_0 + // https://github.com/aspnet/ServerTests/issues/82 [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] @@ -329,7 +329,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(authTypeList.Count(), response.Headers.WwwAuthenticate.Count); } } -#endif + [ConditionalFact] public async Task AuthTypes_Forbid_Forbidden() { diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/AuthenticationTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/AuthenticationTests.cs index db32323bdf..3e8e4f44c3 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Listener/AuthenticationTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/AuthenticationTests.cs @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Empty(response.Headers.WwwAuthenticate); } } -#if !NETCOREAPP2_0 + // https://github.com/aspnet/ServerTests/issues/82 [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] @@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase); } } -#endif + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)] @@ -217,4 +217,4 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener } } } -} \ No newline at end of file +} diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs index 0c91833773..af286bc7f3 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs @@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener context = await server.AcceptAsync(Utilities.DefaultTimeout); context.Response.Headers["Content-lenGth"] = " 20 "; context.Dispose(); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif @@ -330,7 +330,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif @@ -362,7 +362,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif @@ -660,4 +660,4 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener } } } -} \ No newline at end of file +} diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs index 727dd69ec6..b3c6a7eab6 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs @@ -252,7 +252,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Equal(0, response.ContentLength); Assert.NotNull(response.Headers["Date"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); -#if NETCOREAPP2_0 || NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. +#if NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]); #elif NET461 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate")); @@ -283,7 +283,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Equal(0, response.ContentLength); Assert.NotNull(response.Headers["Date"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); -#if NETCOREAPP2_0 || NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. +#if NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]); #elif NET461 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1")); @@ -538,4 +538,4 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener return await _client.SendAsync(request); } } -} \ No newline at end of file +} diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseSendFileTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseSendFileTests.cs index 990af071e7..bb8266b8d3 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseSendFileTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseSendFileTests.cs @@ -371,7 +371,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif @@ -403,7 +403,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif @@ -590,4 +590,4 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener } } } -} \ No newline at end of file +} diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs index e70e3de1ac..f8c405cbab 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener using (var server = Utilities.CreateHttpServer(out address)) { Task responseTask = SendRequestAsync(address); - + var context = await server.AcceptAsync(Utilities.DefaultTimeout); context.Response.ContentLength = 11; var writer = new StreamWriter(context.Response.Body); @@ -188,7 +188,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener // HttpClient re-tries the request because it doesn't know if the request was received. context = await server.AcceptAsync(Utilities.DefaultTimeout); context.Abort(); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target framework needs to be updated #endif diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj index d3778fdded..3643af7bae 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.1;net461 HttpSys.FunctionalTests diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs index ec93832e18..2f4ca4155b 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(0, response.ContentLength); Assert.NotNull(response.Headers["Date"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); -#if NETCOREAPP2_0 || NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. +#if NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]); #elif NET461 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate")); @@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(0, response.ContentLength); Assert.NotNull(response.Headers["Date"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); -#if NETCOREAPP2_0 || NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. +#if NETCOREAPP2_1 // WebHeaderCollection.GetValues() not available in CoreCLR. Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]); #elif NET461 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1")); diff --git a/src/Servers/HttpSys/test/Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj b/src/Servers/HttpSys/test/Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj index d79cff88fa..712edd12a8 100644 --- a/src/Servers/HttpSys/test/Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj +++ b/src/Servers/HttpSys/test/Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.1;net461 diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj index de37395456..59478197a6 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.1;net461 IISIntegration.E2ETests diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs index 78c6b30175..7b88305d25 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,6 +1,6 @@ // 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. -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System.IO; using System.Threading.Tasks; diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs index b0073174e3..c17b241756 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs @@ -1,6 +1,6 @@ // 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. -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System; using System.IO; diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 0f2903e679..10f236c3f7 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif 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..b46ff50c89 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.1;net461 diff --git a/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj index ca0d979dec..f75964d5ae 100644 --- a/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -3,7 +3,7 @@ - $(StandardTestTfms) + netcoreapp2.1;net461 diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj index 1998485c20..1e6d30793a 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 Exe true true diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/README.md b/src/Servers/Kestrel/perf/Kestrel.Performance/README.md index 91991f82ff..b48d648b0a 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/README.md +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/README.md @@ -2,10 +2,10 @@ To run a specific benchmark add it as parameter ``` -dotnet run -f netcoreapp2.0 -c Release RequestParsing +dotnet run -f netcoreapp2.1 -c Release RequestParsing ``` To run all use `All` as parameter ``` -dotnet run -f netcoreapp2.0 -c Release All +dotnet run -f netcoreapp2.1 -c Release All ``` Using no parameter will list all available benchmarks diff --git a/src/Servers/Kestrel/samples/Http2SampleApp/Dockerfile b/src/Servers/Kestrel/samples/Http2SampleApp/Dockerfile index e93d563bde..be66819141 100644 --- a/src/Servers/Kestrel/samples/Http2SampleApp/Dockerfile +++ b/src/Servers/Kestrel/samples/Http2SampleApp/Dockerfile @@ -9,6 +9,6 @@ ARG CONFIGURATION=Debug WORKDIR /app -COPY ./bin/${CONFIGURATION}/netcoreapp2.0/publish/ /app +COPY ./bin/${CONFIGURATION}/netcoreapp2.1/publish/ /app ENTRYPOINT [ "/usr/bin/dotnet", "/app/Http2SampleApp.dll" ] diff --git a/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.ps1 b/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.ps1 index eda82ace6f..8785312e36 100644 --- a/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.ps1 +++ b/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.ps1 @@ -1,3 +1,3 @@ -dotnet publish --framework netcoreapp2.0 "$PSScriptRoot/../Http2SampleApp.csproj" +dotnet publish --framework netcoreapp2.1 "$PSScriptRoot/../Http2SampleApp.csproj" docker build -t kestrel-http2-sample (Convert-Path "$PSScriptRoot/..") diff --git a/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.sh b/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.sh index ca226f0b53..51d0a23b45 100644 --- a/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.sh +++ b/src/Servers/Kestrel/samples/Http2SampleApp/scripts/build-docker.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -dotnet publish --framework netcoreapp2.0 "$DIR/../Http2SampleApp.csproj" +dotnet publish --framework netcoreapp2.1 "$DIR/../Http2SampleApp.csproj" docker build -t kestrel-http2-sample "$DIR/.." diff --git a/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj b/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj index 16d7aa18d1..f2c0c8a820 100644 --- a/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj +++ b/src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0;net461 + netcoreapp2.1;net461 false true diff --git a/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj b/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj index fff5a6c3bd..5ba9b08381 100644 --- a/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj +++ b/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 false true diff --git a/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj b/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj index a9bd0733b2..f76361e7e8 100644 --- a/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj +++ b/src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 false true diff --git a/src/Servers/Kestrel/test/SystemdActivation/docker.sh b/src/Servers/Kestrel/test/SystemdActivation/docker.sh index f2ba5fe506..d93d4d701f 100644 --- a/src/Servers/Kestrel/test/SystemdActivation/docker.sh +++ b/src/Servers/Kestrel/test/SystemdActivation/docker.sh @@ -4,8 +4,8 @@ set -e scriptDir=$(dirname "${BASH_SOURCE[0]}") PATH="$PWD/.dotnet/:$PATH" -dotnet publish -f netcoreapp2.0 ./samples/SystemdTestApp/ -cp -R ./samples/SystemdTestApp/bin/Debug/netcoreapp2.0/publish/ $scriptDir +dotnet publish -f netcoreapp2.1 ./samples/SystemdTestApp/ +cp -R ./samples/SystemdTestApp/bin/Debug/netcoreapp2.1/publish/ $scriptDir cp -R ./.dotnet/ $scriptDir image=$(docker build -qf $scriptDir/Dockerfile $scriptDir) diff --git a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj index 3a209fea5b..71b21d46dd 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 Exe false true diff --git a/src/Servers/test/FunctionalTests/Helpers.cs b/src/Servers/test/FunctionalTests/Helpers.cs index 36864d684c..0d764ef77a 100644 --- a/src/Servers/test/FunctionalTests/Helpers.cs +++ b/src/Servers/test/FunctionalTests/Helpers.cs @@ -54,13 +54,7 @@ namespace ServerComparison.FunctionalTests } else if (runtimeFlavor == RuntimeFlavor.CoreClr) { -#if NETCOREAPP2_0 - return "netcoreapp2.0"; -#elif NETCOREAPP2_1 || NET461 return "netcoreapp2.1"; -#else -#error Target frameworks need to be updated. -#endif } throw new ArgumentException($"Unknown RuntimeFlavor '{runtimeFlavor}'"); diff --git a/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs index 4050625d76..990aed4d70 100644 --- a/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs +++ b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs @@ -22,17 +22,12 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [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=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)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Standalone)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, - string targetFramework, RuntimeArchitecture architecture, ApplicationType applicationType, HostingModel hostingModel = HostingModel.OutOfProcess, @@ -48,7 +43,7 @@ namespace ServerComparison.FunctionalTests EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "NtlmAuthentication.config", nginxConfig: null), SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config - TargetFramework = targetFramework, + TargetFramework = "netcoreapp2.1", ApplicationType = applicationType, HostingModel = hostingModel, AdditionalPublishParameters = additionalPublishParameters @@ -111,4 +106,4 @@ namespace ServerComparison.FunctionalTests } } } -} \ No newline at end of file +} diff --git a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj index 8a6dceefc0..50d9a41158 100644 --- a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.1;net461 win7-x86;win7-x64;linux-x64;osx-x64 diff --git a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj index c6aea92edb..97376a8162 100644 --- a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj +++ b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + netcoreapp2.1 false Exe diff --git a/src/SignalR/samples/JwtSample/JwtSample.csproj b/src/SignalR/samples/JwtSample/JwtSample.csproj index 248cefcabe..735ea0cd24 100644 --- a/src/SignalR/samples/JwtSample/JwtSample.csproj +++ b/src/SignalR/samples/JwtSample/JwtSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + netcoreapp2.1 diff --git a/src/SignalR/test/Directory.Build.props b/src/SignalR/test/Directory.Build.props index f96bfd2def..ae9c6b5322 100644 --- a/src/SignalR/test/Directory.Build.props +++ b/src/SignalR/test/Directory.Build.props @@ -2,10 +2,6 @@ - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(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..7c2e5db5a1 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.1;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..961decb92f 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.1;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..8b1f0db510 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.1;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 585c330599..5de838714e 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.1;net461 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 3b4fd5daa1..5e1fcadea7 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.1;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 50d9afa54a..b57b02f6ef 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.1;net461 Microsoft.AspNetCore.SignalR.Tests 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 160b08c498..b4fbcf3c19 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.1;net461