Merge branch 'rel/2.0.0-preview1' into dev

2017-05-05 12:01:50 -07:00 · 2017-05-05 12:01:50 -07:00 · f7c9b27985
parent cf8483a82a 733e24f9bc
commit f7c9b27985
18 changed files with 14 additions and 62 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 NET46
+
        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
            if (_isBuffering)
@ -184,10 +184,7 @@ namespace Microsoft.AspNetCore.Buffering
                _innerStream.EndWrite(asyncResult);
            }
        }
-#elif NETSTANDARD1_3
-#else
-#error target frameworks need to be updated
-#endif
+
        public override void Flush()
        {
            _isBuffering = false;
--- 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>
--- 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>
--- a/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs
+++ b/src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs
@ -137,7 +137,6 @@ namespace Microsoft.AspNetCore.ResponseCompression
            }
        }

-#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 @@ 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)
        {
--- 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
 {
--- a/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs
+++ b/src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs
@ -37,13 +37,7 @@ namespace Microsoft.AspNetCore.ResponseCompression
        {
            get
            {
-#if NET46
-                return false;
-#elif NETSTANDARD1_3
                return true;
-#else
-#error target frameworks need to be updated
-#endif
            }
        }

--- 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>
--- 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>
--- 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>
--- 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>
--- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs
+++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs
@ -108,7 +108,6 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
            Assert.Equal(File.ReadAllBytes(path), written);
        }

-#if NET46
        [Theory]
        [InlineData(true)]
        [InlineData(false)]
@ -133,10 +132,6 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests

            Assert.Equal(buffer, written);
        }
-#elif NETCOREAPP2_0
-#else
-#error Target framework needs to be updated
-#endif

        private class MockResponseCompressionProvider: IResponseCompressionProvider
        {
--- 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>
--- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs
@ -505,16 +505,9 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests

            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 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests

            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();

--- 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>