diff --git a/.gitignore b/.gitignore index 563425dff6..23826aae91 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ nuget.exe *.sln.ide project.lock.json /.vs/ +.vscode/ .build/ .testPublish/ launchSettings.json diff --git a/samples/ResponseCachingSample/ResponseCachingSample.csproj b/samples/ResponseCachingSample/ResponseCachingSample.csproj index 1b3f3abc14..c4f6bbf77e 100644 --- a/samples/ResponseCachingSample/ResponseCachingSample.csproj +++ b/samples/ResponseCachingSample/ResponseCachingSample.csproj @@ -3,7 +3,7 @@ - net46;netcoreapp2.0 + netcoreapp2.0 diff --git a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj index 3bc517f42c..9cfefda6a4 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj @@ -4,7 +4,7 @@ ASP.NET Core response caching middleware abstractions and feature interface definitions. - netstandard1.3 + netcoreapp2.0 true aspnetcore;cache;caching diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj index 276b379bd3..3b5cca5e23 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj @@ -4,7 +4,7 @@ ASP.NET Core middleware for caching HTTP responses on the server. - netstandard1.3 + netcoreapp2.0 $(NoWarn);CS1591 true true diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs b/src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs index aa5fc371eb..c9d476c97d 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs +++ b/src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs @@ -183,19 +183,12 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal } } -#if NETSTANDARD1_3 - public IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) -#else public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) -#endif { return StreamUtilities.ToIAsyncResult(WriteAsync(buffer, offset, count), callback, state); } -#if NETSTANDARD1_3 - public void EndWrite(IAsyncResult asyncResult) -#else + public override void EndWrite(IAsyncResult asyncResult) -#endif { if (asyncResult == null) { diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs b/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs index 51ff15ff41..83c60dd0c5 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs +++ b/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs @@ -140,11 +140,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal return byteRead; } -#if NETSTANDARD1_3 - public IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) -#else public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) -#endif { var tcs = new TaskCompletionSource(state); @@ -176,11 +172,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal return tcs.Task; } -#if NETSTANDARD1_3 - public int EndRead(IAsyncResult asyncResult) -#else public override int EndRead(IAsyncResult asyncResult) -#endif { if (asyncResult == null) { diff --git a/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs b/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs index 6fb93c5c7b..6efeaf589f 100644 --- a/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs +++ b/src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs @@ -190,20 +190,12 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal _length++; } -#if NETSTANDARD1_3 - public IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) -#else public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) -#endif { return StreamUtilities.ToIAsyncResult(WriteAsync(buffer, offset, count), callback, state); } -#if NETSTANDARD1_3 - public void EndWrite(IAsyncResult asyncResult) -#else public override void EndWrite(IAsyncResult asyncResult) -#endif { if (asyncResult == null) { diff --git a/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj b/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj index 8480593651..d9ea33474f 100644 --- a/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj +++ b/test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj @@ -3,8 +3,7 @@ - netcoreapp2.0;net46 - netcoreapp2.0 + netcoreapp2.0 true true