diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 71d2c6de7f..a985da4c37 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -30,7 +30,6 @@ - diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props index 1b9a79ba77..aa54a0b4dc 100644 --- a/eng/dependencies.temp.props +++ b/eng/dependencies.temp.props @@ -6,6 +6,7 @@ This is required to provide dependencies for samples and tests. + diff --git a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj index a8eb42bb02..1a2e960495 100644 --- a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj +++ b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj @@ -4,7 +4,7 @@ ASP.NET Core middleware for filtering out requests with unknown HTTP host headers. - netstandard2.0 + netcoreapp3.0 true aspnetcore @@ -13,6 +13,6 @@ - + diff --git a/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj b/src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj index dfe8ded9f5..b282f145f9 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) + netcoreapp3.0 diff --git a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj index 11b2130693..23b78b1c16 100644 --- a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj @@ -4,7 +4,7 @@ ASP.NET Core basic middleware for supporting HTTP method overrides. Includes: * X-Forwarded-* headers to forward headers from a proxy. * HTTP method override header. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;proxy;headers;xforwarded diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index eeef37e17e..ff24182f9f 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) + netcoreapp3.0 diff --git a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj index aea2ed8ba3..9a65996044 100644 --- a/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj +++ b/src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj index f367ea28cc..2e11bf0dd1 100644 --- a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj +++ b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj @@ -4,7 +4,7 @@ ASP.NET Core basic middleware for supporting HTTPS Redirection and HTTP Strict-Transport-Security. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;https;hsts @@ -15,6 +15,6 @@ - + diff --git a/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs b/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs index 20a88dd30a..a04a4ee0cc 100644 --- a/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs +++ b/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs @@ -30,22 +30,13 @@ namespace Microsoft.AspNetCore.ResponseCompression private BrotliCompressionProviderOptions Options { get; } /// - public string EncodingName => "br"; + public string EncodingName { get; } = "br"; /// - public bool SupportsFlush => true; + public bool SupportsFlush { get; } = true; /// public Stream CreateStream(Stream outputStream) - { -#if NETCOREAPP2_1 - return new BrotliStream(outputStream, Options.Level, leaveOpen: true); -#elif NET461 || NETSTANDARD2_0 - // Brotli is only supported in .NET Core 2.1+ - throw new PlatformNotSupportedException(); -#else -#error Target frameworks need to be updated. -#endif - } + => new BrotliStream(outputStream, Options.Level, leaveOpen: true); } } diff --git a/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs b/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs index 474f255111..cc0ac6d950 100644 --- a/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs +++ b/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs @@ -30,27 +30,13 @@ namespace Microsoft.AspNetCore.ResponseCompression private GzipCompressionProviderOptions Options { get; } /// - public string EncodingName => "gzip"; + public string EncodingName { get; } = "gzip"; /// - public bool SupportsFlush - { - get - { -#if NET461 - return false; -#elif NETSTANDARD2_0 || NETCOREAPP2_1 - return true; -#else -#error target frameworks need to be updated -#endif - } - } + public bool SupportsFlush { get; } = true; /// public Stream CreateStream(Stream outputStream) - { - return new GZipStream(outputStream, Options.Level, leaveOpen: true); - } + => new GZipStream(outputStream, Options.Level, leaveOpen: true); } } diff --git a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj index 68bafb36d8..f35baf967d 100644 --- a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj @@ -8,7 +8,6 @@ - diff --git a/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs index b63ff7380e..6a3f23fe17 100644 --- a/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs +++ b/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs @@ -48,13 +48,7 @@ namespace Microsoft.AspNetCore.ResponseCompression // Use the factory so it can resolve IOptions from DI. _providers = new ICompressionProvider[] { -#if NETCOREAPP2_1 new CompressionProviderFactory(typeof(BrotliCompressionProvider)), -#elif NET461 || NETSTANDARD2_0 - // Brotli is only supported in .NET Core 2.1+ -#else -#error Target frameworks need to be updated. -#endif new CompressionProviderFactory(typeof(GzipCompressionProvider)), }; } diff --git a/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj index cce4750f61..65e2283b5a 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) + netcoreapp3.0 diff --git a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs index 8cf9d3bf1e..f7c74c3fb2 100644 --- a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs +++ b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs @@ -37,12 +37,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests get { yield return new EncodingTestData("gzip", expectedBodyLength: 24); -#if NETCOREAPP2_2 yield return new EncodingTestData("br", expectedBodyLength: 20); -#elif NET461 -#else -#error Target frameworks need to be updated. -#endif } } @@ -77,14 +72,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests { var (response, logMessages) = await InvokeMiddleware(100, requestAcceptEncodings: new[] { "br" }, responseType: TextPlain); -#if NET461 - CheckResponseNotCompressed(response, expectedBodyLength: 100, sendVaryHeader: true); -#elif NETCOREAPP2_2 CheckResponseCompressed(response, expectedBodyLength: 20, expectedEncoding: "br"); AssertCompressedWithLog(logMessages, "br"); -#else -#error Target frameworks need to be updated. -#endif } [Theory] @@ -94,18 +83,10 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests { var (response, logMessages) = await InvokeMiddleware(100, new[] { encoding1, encoding2 }, responseType: TextPlain); -#if NET461 - CheckResponseCompressed(response, expectedBodyLength: 24, expectedEncoding: "gzip"); - AssertCompressedWithLog(logMessages, "gzip"); -#elif NETCOREAPP2_2 CheckResponseCompressed(response, expectedBodyLength: 20, expectedEncoding: "br"); AssertCompressedWithLog(logMessages, "br"); -#else -#error Target frameworks need to be updated. -#endif } -#if NETCOREAPP2_2 [Theory] [InlineData("gzip", "br")] [InlineData("br", "gzip")] @@ -122,10 +103,6 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests CheckResponseCompressed(response, expectedBodyLength: 24, expectedEncoding: "gzip"); AssertCompressedWithLog(logMessages, "gzip"); } -#elif NET461 -#else -#error Target frameworks need to be updated. -#endif [Fact] public async Task Request_AcceptUnknown_NotCompressed() @@ -339,15 +316,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests { var (response, logMessages) = await InvokeMiddleware(100, requestAcceptEncodings: new[] { "*" }, responseType: TextPlain); -#if NET461 - CheckResponseCompressed(response, expectedBodyLength: 24, expectedEncoding: "gzip"); - AssertCompressedWithLog(logMessages, "gzip"); -#elif NETCOREAPP2_2 CheckResponseCompressed(response, expectedBodyLength: 20, expectedEncoding: "br"); AssertCompressedWithLog(logMessages, "br"); -#else -#error Target frameworks need to be updated. -#endif } [Fact] @@ -699,16 +669,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests request.Headers.AcceptEncoding.ParseAdd(encoding); var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); - -#if NET461 // Flush not supported, compression disabled - Assert.NotNull(response.Content.Headers.GetValues(HeaderNames.ContentMD5)); - Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP2_2 // Flush supported, compression enabled Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out _)); Assert.Single(response.Content.Headers.ContentEncoding, encoding); -#else -#error Target frameworks need to be updated. -#endif var body = await response.Content.ReadAsStreamAsync(); @@ -764,16 +726,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests request.Headers.AcceptEncoding.ParseAdd(encoding); var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); - -#if NET461 // Flush not supported, compression disabled - Assert.NotNull(response.Content.Headers.GetValues(HeaderNames.ContentMD5)); - Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP2_2 // Flush supported, compression enabled Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out _)); Assert.Single(response.Content.Headers.ContentEncoding, encoding); -#else -#error Target framework needs to be updated -#endif var body = await response.Content.ReadAsStreamAsync(); diff --git a/src/Middleware/Rewrite/sample/RewriteSample.csproj b/src/Middleware/Rewrite/sample/RewriteSample.csproj index 7869723e48..95dd8d25a8 100644 --- a/src/Middleware/Rewrite/sample/RewriteSample.csproj +++ b/src/Middleware/Rewrite/sample/RewriteSample.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj index 48a6e913f5..0ac6ec15b1 100644 --- a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj @@ -5,7 +5,7 @@ * Support for custom URL rewrite rules * Support for running IIS URL Rewrite module rules * Support for running Apache mod_rewrite rules. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;urlrewrite;mod_rewrite diff --git a/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj b/src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj index 87bf4497b5..21be8d7e32 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) + netcoreapp3.0