netcoreapp2.0 (#228)

pakrym · web-flow · commit 733e24f9bc8b · 2017-05-05T12:01:15.000-07:00
diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <VersionPrefix>0.3.0</VersionPrefix>
     <Description>ASP.NET Core middleware for buffering response bodies.</Description>
-    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;buffer;buffering</PackageTags>
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj
@@ -7,7 +7,7 @@
     <Description>ASP.NET Core basic middleware for supporting HTTP method overrides. Includes:
 * X-Forwarded-* headers to forward headers from a proxy.
 * HTTP method override header.</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;proxy;headers;xforwarded</PackageTags>
diff --git 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<object>(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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
     <Description>ASP.NET Core middleware for HTTP Response compression.</Description>
-    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore</PackageTags>
   </PropertyGroup>
diff --git 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.</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;urlrewrite;mod_rewrite</PackageTags>
diff --git 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 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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
@@ -3,10 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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<string> 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<string> 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
@@ -3,10 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati`
`160`	`160`	`return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`		`-#if NET46`
	`163`	`+`
`164`	`164`	`public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)`
`165`	`165`	`{`
`166`	`166`	`if (_isBuffering)`
`@@ -184,10 +184,7 @@ public override void EndWrite(IAsyncResult asyncResult)`
`184`	`184`	`_innerStream.EndWrite(asyncResult);`
`185`	`185`	`}`
`186`	`186`	`}`
`187`		`-#elif NETSTANDARD1_3`
`188`		`-#else`
`189`		`-#error target frameworks need to be updated`
`190`		`-#endif`
	`187`	`+`
`191`	`188`	`public override void Flush()`
`192`	`189`	`{`
`193`	`190`	`_isBuffering = false;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ public override void Write(byte[] buffer, int offset, int count)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-#if NET46`
`141`	`140`	`public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, Object state)`
`142`	`141`	`{`
`143`	`142`	`var tcs = new TaskCompletionSource<object>(state);`
`@@ -184,10 +183,6 @@ public override void EndWrite(IAsyncResult asyncResult)`
`184`	`183`	`var task = (Task)asyncResult;`
`185`	`184`	`task.GetAwaiter().GetResult();`
`186`	`185`	`}`
`187`		`-#elif NETSTANDARD1_3`
`188`		`-#else`
`189`		`-#error target frameworks need to be updated`
`190`		`-#endif`
`191`	`186`
`192`	`187`	`public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)`
`193`	`188`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.ObjectModel;`
`6`		`-#if NETSTANDARD1_3`
`7`		`-using System.Reflection;`
`8`		`-#endif`
`9`	`6`
`10`	`7`	`namespace Microsoft.AspNetCore.ResponseCompression`
`11`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,7 @@ public bool SupportsFlush`
`37`	`37`	`{`
`38`	`38`	`get`
`39`	`39`	`{`
`40`		`-#if NET46`
`41`		`- return false;`
`42`		`-#elif NETSTANDARD1_3`
`43`	`40`	`return true;`
`44`		`-#else`
`45`		`-#error target frameworks need to be updated`
`46`		`-#endif`
`47`	`41`	`}`
`48`	`42`	`}`
`49`	`43`