Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev

Author: mikeharder

.gitignore

@@ -26,6 +26,7 @@ nuget.exe
 *.sln.ide
 project.lock.json
 /.vs/
+.vscode/
 .build/
 .testPublish/
 launchSettings.json

samples/ResponseCachingSample/ResponseCachingSample.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Microsoft.AspNetCore.ResponseCaching.Abstractions/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core response caching middleware abstractions and feature interface definitions.</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;cache;caching</PackageTags>
   </PropertyGroup>

src/Microsoft.AspNetCore.ResponseCaching/Microsoft.AspNetCore.ResponseCaching.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core middleware for caching HTTP responses on the server.</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Microsoft.AspNetCore.ResponseCaching/Streams/ResponseCachingStream.cs

@@ -183,19 +183,12 @@ public override void WriteByte(byte value)
             }
         }
 
-#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)
             {

src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentReadStream.cs

@@ -140,11 +140,7 @@ public override int ReadByte()
             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<int>(state);
 
@@ -176,11 +172,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy
             return tcs.Task;
         }
 
-#if NETSTANDARD1_3
-        public int EndRead(IAsyncResult asyncResult)
-#else
         public override int EndRead(IAsyncResult asyncResult)
-#endif
         {
             if (asyncResult == null)
             {

src/Microsoft.AspNetCore.ResponseCaching/Streams/SegmentWriteStream.cs

@@ -190,20 +190,12 @@ public override void WriteByte(byte value)
             _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)
             {

test/Microsoft.AspNetCore.ResponseCaching.Tests/Microsoft.AspNetCore.ResponseCaching.Tests.csproj

@@ -3,8 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>