From 887bd70fd35495fdf4756927f5b966b2b883c355 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 12 Oct 2016 16:07:55 -0700 Subject: [PATCH] Revert "Updating to netcoreapp1.1" This reverts commit 151bb91997df83a8a060aeca9d2a65eda801e478. --- samples/HttpOverridesSample/project.json | 2 +- samples/ResponseBufferingSample/project.json | 2 +- samples/ResponseCompressionSample/project.json | 2 +- samples/RewriteSample/project.json | 2 +- test/Microsoft.AspNetCore.Buffering.Tests/project.json | 2 +- test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json | 2 +- .../ResponseCompressionMiddlewareTest.cs | 6 +++--- .../project.json | 2 +- test/Microsoft.AspNetCore.Rewrite.Tests/project.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/samples/HttpOverridesSample/project.json b/samples/HttpOverridesSample/project.json index 2d0730a..9c93a8e 100644 --- a/samples/HttpOverridesSample/project.json +++ b/samples/HttpOverridesSample/project.json @@ -18,7 +18,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/samples/ResponseBufferingSample/project.json b/samples/ResponseBufferingSample/project.json index 1cf3d05..d48a3ac 100644 --- a/samples/ResponseBufferingSample/project.json +++ b/samples/ResponseBufferingSample/project.json @@ -9,7 +9,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/samples/ResponseCompressionSample/project.json b/samples/ResponseCompressionSample/project.json index c5b1475..07bfa73 100644 --- a/samples/ResponseCompressionSample/project.json +++ b/samples/ResponseCompressionSample/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/samples/RewriteSample/project.json b/samples/RewriteSample/project.json index 3002dcf..c70f27f 100644 --- a/samples/RewriteSample/project.json +++ b/samples/RewriteSample/project.json @@ -11,7 +11,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/project.json b/test/Microsoft.AspNetCore.Buffering.Tests/project.json index 0fa3b7e..feaf435 100644 --- a/test/Microsoft.AspNetCore.Buffering.Tests/project.json +++ b/test/Microsoft.AspNetCore.Buffering.Tests/project.json @@ -10,7 +10,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json b/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json index 461246f..e738c8d 100644 --- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json +++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json @@ -11,7 +11,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs index 048dc10..08e3f88 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -496,7 +496,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests #if NET451 // 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 NETCOREAPP1_0 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); @@ -561,7 +561,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests #if NET451 // 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 NETCOREAPP1_0 // Flush supported, compression enabled IEnumerable contentMD5 = null; Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5)); Assert.Single(response.Content.Headers.ContentEncoding, "gzip"); diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/project.json b/test/Microsoft.AspNetCore.ResponseCompression.Tests/project.json index f9948f9..af92266 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/project.json +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/project.json @@ -15,7 +15,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/project.json b/test/Microsoft.AspNetCore.Rewrite.Tests/project.json index cfdad1e..2126a31 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/project.json +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/project.json @@ -12,7 +12,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.CodeCoverage": { "type": "build",