diff --git a/build/dependencies.props b/build/dependencies.props index 50283ae2..a353b252 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,7 +2,7 @@ 2.0.0-preview1-* 4.3.0 - 2.0.0-* + 2.1.0-* 4.7.1 $(BundledNETStandardPackageVersion) 15.0.0 diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj index c163d00c..a81f0815 100644 --- a/samples/HttpOverridesSample/HttpOverridesSample.csproj +++ b/samples/HttpOverridesSample/HttpOverridesSample.csproj @@ -3,7 +3,7 @@ - net46;netcoreapp2.0 + netcoreapp2.0 diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj index 0a99f501..cec354e0 100644 --- a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj +++ b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj @@ -3,7 +3,7 @@ - net46;netcoreapp2.0 + netcoreapp2.0 diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj index 37e37f9c..7de989af 100644 --- a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj +++ b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj @@ -3,7 +3,7 @@ - net46;netcoreapp2.0 + netcoreapp2.0 diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj index 8dc059dc..a63cca04 100644 --- a/samples/RewriteSample/RewriteSample.csproj +++ b/samples/RewriteSample/RewriteSample.csproj @@ -3,7 +3,7 @@ - net46;netcoreapp2.0 + netcoreapp2.0 diff --git a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs index 29ab23bd..b81b7092 100644 --- a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs +++ b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs @@ -160,7 +160,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); } } -#if NET46 + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { if (_isBuffering) @@ -184,10 +184,7 @@ public override void EndWrite(IAsyncResult asyncResult) _innerStream.EndWrite(asyncResult); } } -#elif NETSTANDARD1_3 -#else -#error target frameworks need to be updated -#endif + public override void Flush() { _isBuffering = false; diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj index 658f4a83..36915fa2 100644 --- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj +++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj @@ -5,7 +5,7 @@ 0.3.0 ASP.NET Core middleware for buffering response bodies. - net46;netstandard1.3 + netcoreapp2.0 $(NoWarn);CS1591 true aspnetcore;buffer;buffering diff --git a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj index ab49dd26..01cfb31f 100644 --- a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj @@ -7,7 +7,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. - netstandard1.3 + netcoreapp2.0 $(NoWarn);CS1591 true aspnetcore;proxy;headers;xforwarded diff --git a/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs b/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs index ff25fe8b..d315d82d 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs +++ b/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs @@ -137,7 +137,6 @@ public override void Write(byte[] buffer, int offset, int count) } } -#if NET46 public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, Object state) { var tcs = new TaskCompletionSource(state); @@ -184,10 +183,6 @@ public override void EndWrite(IAsyncResult asyncResult) var task = (Task)asyncResult; task.GetAwaiter().GetResult(); } -#elif NETSTANDARD1_3 -#else -#error target frameworks need to be updated -#endif public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { diff --git a/src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs b/src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs index a04e9209..e4d15ef5 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs +++ b/src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs @@ -3,9 +3,6 @@ using System; using System.Collections.ObjectModel; -#if NETSTANDARD1_3 -using System.Reflection; -#endif namespace Microsoft.AspNetCore.ResponseCompression { diff --git a/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs b/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs index 0588995d..b7716f17 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs +++ b/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs @@ -37,13 +37,7 @@ public bool SupportsFlush { get { -#if NET46 - return false; -#elif NETSTANDARD1_3 return true; -#else -#error target frameworks need to be updated -#endif } } diff --git a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj index 80e48518..fc5f1b53 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj @@ -5,7 +5,7 @@ 2.0.0 ASP.NET Core middleware for HTTP Response compression. - net46;netstandard1.3 + netcoreapp2.0 true aspnetcore diff --git a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj index 028eaeaa..530e010f 100644 --- a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj @@ -8,7 +8,7 @@ * Support for custom URL rewrite rules * Support for running IIS URL Rewrite module rules * Support for running Apache mod_rewrite rules. - netstandard1.3 + netcoreapp2.0 $(NoWarn);CS1591 true aspnetcore;urlrewrite;mod_rewrite diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj index 2af1f9b1..1a2e0b4b 100644 --- a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj +++ b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj @@ -3,10 +3,7 @@ - netcoreapp2.0;net46 - netcoreapp2.0 - true - true + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index b525b892..2b04e296 100644 --- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -3,10 +3,7 @@ - netcoreapp2.0;net46 - netcoreapp2.0 - true - true + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs index a1efd4a4..46c7fb46 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs @@ -108,7 +108,6 @@ public async Task SendFileAsync_IsPassedToUnderlyingStream_WhenDisableResponseBu Assert.Equal(File.ReadAllBytes(path), written); } -#if NET46 [Theory] [InlineData(true)] [InlineData(false)] @@ -133,10 +132,6 @@ public void BeginWrite_IsPassedToUnderlyingStream_WhenDisableResponseBuffering(b Assert.Equal(buffer, written); } -#elif NETCOREAPP2_0 -#else -#error Target framework needs to be updated -#endif private class MockResponseCompressionProvider: IResponseCompressionProvider { diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj index 27ab9222..faf06497 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj @@ -3,10 +3,7 @@ - netcoreapp2.0;net46 - netcoreapp2.0 - true - true + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs index 34fd5f2c..4fa7b92e 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs @@ -505,16 +505,9 @@ public async Task TrickleWriteAndFlush_FlushesEachWrite() var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); -#if NET46 // Flush not supported, compression disabled - Assert.NotNull(response.Headers.GetValues(HeaderNames.ContentMD5)); - Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP2_0 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); -#else -#error Target frameworks need to be updated. -#endif var body = await response.Content.ReadAsStreamAsync(); @@ -570,16 +563,9 @@ public async Task TrickleWriteAndFlushAsync_FlushesEachWrite() var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); -#if NET46 // Flush not supported, compression disabled - Assert.NotNull(response.Headers.GetValues(HeaderNames.ContentMD5)); - Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP2_0 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); -#else -#error Target framework needs to be updated -#endif var body = await response.Content.ReadAsStreamAsync(); diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj index 79c1c1c2..bbff9efe 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj @@ -3,10 +3,7 @@ - netcoreapp2.0;net46 - netcoreapp2.0 - true - true + netcoreapp2.0