From 7e9b92072e87fa0ab84e885e23ea9971103921d2 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Wed, 22 Mar 2017 23:31:22 -0700 Subject: [PATCH] Converted samples and test projects to run on netcoreapp2.0 --- build/dependencies.props | 1 + samples/HttpOverridesSample/HttpOverridesSample.csproj | 2 +- .../ResponseBufferingSample.csproj | 2 +- .../ResponseCompressionSample.csproj | 2 +- samples/RewriteSample/RewriteSample.csproj | 2 +- .../Microsoft.AspNetCore.Buffering.Tests.csproj | 4 ++-- .../Microsoft.AspNetCore.HttpOverrides.Tests.csproj | 4 ++-- .../BodyWrapperStreamTests.cs | 3 +++ .../Microsoft.AspNetCore.ResponseCompression.Tests.csproj | 4 ++-- .../ResponseCompressionMiddlewareTest.cs | 8 ++++---- .../Microsoft.AspNetCore.Rewrite.Tests.csproj | 4 ++-- 11 files changed, 20 insertions(+), 16 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c153f0e3f9..35c5cad19a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,6 +4,7 @@ 4.3.0 4.7.1 1.6.1 + 2.0.0-* 15.0.0 2.2.0 diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj index 2cf83ecfad..e6ff05beb5 100644 --- a/samples/HttpOverridesSample/HttpOverridesSample.csproj +++ b/samples/HttpOverridesSample/HttpOverridesSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp1.1 + net451;netcoreapp2.0 diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj index 90bf35c252..72a62c9228 100644 --- a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj +++ b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp1.1 + net451;netcoreapp2.0 diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj index 7c668a7ced..42ff9ed947 100644 --- a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj +++ b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp1.1 + net451;netcoreapp2.0 diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj index 56e834d177..d2b8a51d9e 100644 --- a/samples/RewriteSample/RewriteSample.csproj +++ b/samples/RewriteSample/RewriteSample.csproj @@ -3,7 +3,7 @@ - net451;netcoreapp1.1 + net451;netcoreapp2.0 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 041439c9a9..7f9b782173 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,8 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net452 + netcoreapp2.0 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 0cdff3e302..faa3154a73 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,8 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net452 + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs index cb89f8f2d9..05b5accf37 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs @@ -133,6 +133,9 @@ 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 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 5240a9ea71..471129dc94 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,8 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net452 + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs index 0494896c11..96847d5d6f 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs @@ -508,12 +508,12 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests #if NET452 // Flush not supported, compression disabled Assert.NotNull(response.Headers.GetValues(HeaderNames.ContentMD5)); Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP1_1 // Flush supported, compression enabled +#elif NETCOREAPP2_0 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); #else - Not implemented, compiler break +#error Target framework needs to be updated #endif var body = await response.Content.ReadAsStreamAsync(); @@ -573,12 +573,12 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests #if NET452 // Flush not supported, compression disabled Assert.NotNull(response.Headers.GetValues(HeaderNames.ContentMD5)); Assert.Empty(response.Content.Headers.ContentEncoding); -#elif NETCOREAPP1_1 // Flush supported, compression enabled +#elif NETCOREAPP2_0 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); #else - Not implemented, compiler break +#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 index e29c1884e8..2febee9e55 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,8 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net452 + netcoreapp2.0