From 7fad55f6b69d4f9210b0215efb66d20b16a5b0c7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Dec 2018 16:08:54 -0800 Subject: [PATCH] Revert "Update basic middleware projects to netcoreapp3.0" This partially reverts commit e0bbda07fca00bd18da9c863e20a72d79a8fd8be. --- .../src/Microsoft.AspNetCore.HostFiltering.csproj | 4 ++-- .../src/Microsoft.AspNetCore.HttpsPolicy.csproj | 4 ++-- .../src/BrotliCompressionProvider.cs | 11 ++++++++++- .../src/GzipCompressionProvider.cs | 14 +++++++++++++- ...Microsoft.AspNetCore.ResponseCompression.csproj | 2 +- .../src/ResponseCompressionProvider.cs | 6 ++++++ .../src/Microsoft.AspNetCore.Rewrite.csproj | 2 +- 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj index 1a2e960495..a8eb42bb02 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. - netcoreapp3.0 + netstandard2.0 true aspnetcore @@ -13,6 +13,6 @@ - + diff --git a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj index 2e11bf0dd1..f367ea28cc 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. - netcoreapp3.0 + netstandard2.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 a04a4ee0cc..28955fd6f7 100644 --- a/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs +++ b/src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs @@ -37,6 +37,15 @@ namespace Microsoft.AspNetCore.ResponseCompression /// public Stream CreateStream(Stream outputStream) - => new BrotliStream(outputStream, Options.Level, leaveOpen: true); + { +#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 + } } } diff --git a/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs b/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs index cc0ac6d950..1e5026430c 100644 --- a/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs +++ b/src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs @@ -33,7 +33,19 @@ namespace Microsoft.AspNetCore.ResponseCompression public string EncodingName { get; } = "gzip"; /// - public bool SupportsFlush { get; } = true; + 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 Stream CreateStream(Stream outputStream) diff --git a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj index f35baf967d..b1fb865276 100644 --- a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj @@ -2,7 +2,7 @@ ASP.NET Core middleware for HTTP Response compression. - netcoreapp3.0 + net461;netstandard2.0;netcoreapp2.1 true aspnetcore diff --git a/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs b/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs index 6a3f23fe17..b63ff7380e 100644 --- a/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs +++ b/src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs @@ -48,7 +48,13 @@ 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/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj index 0ac6ec15b1..48a6e913f5 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. - netcoreapp3.0 + netstandard2.0 $(NoWarn);CS1591 true aspnetcore;urlrewrite;mod_rewrite