diff --git a/.gitignore b/.gitignore index 4b5208332f..c8dd6c52d5 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ project.lock.json .vscode/ *.nuget.props *.nuget.targets +global.json diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj index e6ff05beb5..c163d00c5f 100644 --- a/samples/HttpOverridesSample/HttpOverridesSample.csproj +++ b/samples/HttpOverridesSample/HttpOverridesSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp2.0 + net46;netcoreapp2.0 diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj index 72a62c9228..0a99f5017f 100644 --- a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj +++ b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp2.0 + net46;netcoreapp2.0 diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj index 42ff9ed947..37e37f9c6c 100644 --- a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj +++ b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp2.0 + net46;netcoreapp2.0 diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj index d2b8a51d9e..8dc059dc1d 100644 --- a/samples/RewriteSample/RewriteSample.csproj +++ b/samples/RewriteSample/RewriteSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp2.0 + net46;netcoreapp2.0 diff --git a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs index f3f4dbe8fe..29ab23bde2 100644 --- a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs +++ b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Buffering return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); } } -#if !NETSTANDARD1_3 +#if NET46 public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { if (_isBuffering) @@ -184,6 +184,9 @@ namespace Microsoft.AspNetCore.Buffering _innerStream.EndWrite(asyncResult); } } +#elif NETSTANDARD1_3 +#else +#error target frameworks need to be updated #endif public override void Flush() { diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj index 81bf91be82..658f4a836d 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. - net451;netstandard1.3 + net46;netstandard1.3 $(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 7d8b86ce59..9e175ad34b 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. - net451;netstandard1.3 + netstandard1.3 $(NoWarn);CS1591 true aspnetcore;proxy;headers;xforwarded diff --git a/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs b/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs index 4906e0e2a6..ff25fe8b71 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs +++ b/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs @@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.ResponseCompression } } -#if NET451 +#if NET46 public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, Object state) { var tcs = new TaskCompletionSource(state); @@ -184,6 +184,9 @@ namespace Microsoft.AspNetCore.ResponseCompression 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/GzipCompressionProvider.cs b/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs index b8c3c08517..0588995dd5 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs +++ b/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs @@ -37,12 +37,12 @@ namespace Microsoft.AspNetCore.ResponseCompression { get { -#if NET451 +#if NET46 return false; #elif NETSTANDARD1_3 return true; #else - // Not implemented, compiler break +#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 f542b01c5b..376cfee8c9 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj @@ -5,7 +5,7 @@ 1.1.0 ASP.NET Core middleware for HTTP Response compression. - net451;netstandard1.3 + net46;netstandard1.3 true aspnetcore diff --git a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj index 958f598489..bee8ab2673 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. - net451;netstandard1.3 + netstandard1.3 $(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 7f9b782173..2af1f9b194 100644 --- a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj +++ b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj @@ -3,8 +3,10 @@ - netcoreapp2.0;net452 + netcoreapp2.0;net46 netcoreapp2.0 + true + true 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 faa3154a73..b525b8926b 100644 --- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -3,8 +3,10 @@ - netcoreapp2.0;net452 + netcoreapp2.0;net46 netcoreapp2.0 + true + true diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs index 05b5accf37..a1efd4a458 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs @@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests Assert.Equal(File.ReadAllBytes(path), written); } -#if NET452 +#if NET46 [Theory] [InlineData(true)] [InlineData(false)] 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 471129dc94..27ab922297 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj @@ -3,8 +3,10 @@ - netcoreapp2.0;net452 + netcoreapp2.0;net46 netcoreapp2.0 + true + true diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs index 96847d5d6f..34fd5f2c83 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs @@ -505,7 +505,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); -#if NET452 // Flush not supported, compression disabled +#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 @@ -513,7 +513,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); #else -#error Target framework needs to be updated +#error Target frameworks need to be updated. #endif var body = await response.Content.ReadAsStreamAsync(); @@ -570,7 +570,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); -#if NET452 // Flush not supported, compression disabled +#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 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 2febee9e55..79c1c1c298 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj @@ -3,8 +3,10 @@ - netcoreapp2.0;net452 + netcoreapp2.0;net46 netcoreapp2.0 + true + true