From 6d5cd28e9b3757b1be1bdeb15f64c32dfb66bdb3 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 12 Oct 2016 13:45:30 -0700 Subject: [PATCH] Updating to netcoreapp1.1 --- samples/SampleApp/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../HttpResponseStreamWriterTest.cs | 46 +++++++++---------- .../project.json | 2 +- .../project.json | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json index b4602a1370..8deed583f2 100644 --- a/samples/SampleApp/project.json +++ b/samples/SampleApp/project.json @@ -6,7 +6,7 @@ }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json index 84754903d3..49264209e6 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json @@ -10,7 +10,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json index aee78aef75..15bffa1e68 100644 --- a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json @@ -7,7 +7,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json index f534b6675f..76304be5ff 100644 --- a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json @@ -5,7 +5,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Http.Tests/project.json b/test/Microsoft.AspNetCore.Http.Tests/project.json index 53031a17f8..fe093b87b3 100644 --- a/test/Microsoft.AspNetCore.Http.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Tests/project.json @@ -5,7 +5,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.Owin.Tests/project.json b/test/Microsoft.AspNetCore.Owin.Tests/project.json index de84445e0b..f6759ed2f0 100644 --- a/test/Microsoft.AspNetCore.Owin.Tests/project.json +++ b/test/Microsoft.AspNetCore.Owin.Tests/project.json @@ -7,7 +7,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs index 67e42ea038..307cabbf02 100644 --- a/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs +++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs @@ -336,13 +336,13 @@ namespace Microsoft.AspNetCore.WebUtilities.Test } [Theory] - [InlineData("你好世界", "utf-16")] -#if !NETCOREAPP1_0 + [InlineData("你好世界", "utf-16")] +#if !NETCOREAPP1_1 // CoreCLR does not like shift_jis as an encoding. - [InlineData("こんにちは世界", "shift_jis")] + [InlineData("こんにちは世界", "shift_jis")] #endif - [InlineData("హలో ప్రపంచ", "iso-8859-1")] - [InlineData("வணக்கம் உலக", "utf-32")] + [InlineData("హలో ప్రపంచ", "iso-8859-1")] + [InlineData("வணக்கம் உலக", "utf-32")] public async Task WritesData_InExpectedEncoding(string data, string encodingName) { // Arrange @@ -362,24 +362,24 @@ namespace Microsoft.AspNetCore.WebUtilities.Test } [Theory] - [InlineData('ん', 1023, "utf-8")] - [InlineData('ん', 1024, "utf-8")] - [InlineData('ん', 1050, "utf-8")] - [InlineData('你', 1023, "utf-16")] - [InlineData('你', 1024, "utf-16")] - [InlineData('你', 1050, "utf-16")] -#if !NETCOREAPP1_0 + [InlineData('ã‚“', 1023, "utf-8")] + [InlineData('ã‚“', 1024, "utf-8")] + [InlineData('ã‚“', 1050, "utf-8")] + [InlineData('ä½ ', 1023, "utf-16")] + [InlineData('ä½ ', 1024, "utf-16")] + [InlineData('ä½ ', 1050, "utf-16")] +#if !NETCOREAPP1_1 // CoreCLR does not like shift_jis as an encoding. - [InlineData('こ', 1023, "shift_jis")] - [InlineData('こ', 1024, "shift_jis")] - [InlineData('こ', 1050, "shift_jis")] + [InlineData('こ', 1023, "shift_jis")] + [InlineData('こ', 1024, "shift_jis")] + [InlineData('こ', 1050, "shift_jis")] #endif - [InlineData('హ', 1023, "iso-8859-1")] - [InlineData('హ', 1024, "iso-8859-1")] - [InlineData('హ', 1050, "iso-8859-1")] - [InlineData('வ', 1023, "utf-32")] - [InlineData('வ', 1024, "utf-32")] - [InlineData('வ', 1050, "utf-32")] + [InlineData('à°¹', 1023, "iso-8859-1")] + [InlineData('à°¹', 1024, "iso-8859-1")] + [InlineData('à°¹', 1050, "iso-8859-1")] + [InlineData('வ', 1023, "utf-32")] + [InlineData('வ', 1024, "utf-32")] + [InlineData('வ', 1050, "utf-32")] public async Task WritesData_OfDifferentLength_InExpectedEncoding( char character, int charCount, @@ -437,9 +437,9 @@ namespace Microsoft.AspNetCore.WebUtilities.Test public async Task HttpResponseStreamWriter_WritesDataCorrectly_ForCharactersHavingSurrogatePairs(int characterSize) { // Arrange - // Here "𐐀" (called Deseret Long I) actually represents 2 characters. Try to make this character split across + // Here "𐐀" (called Deseret Long I) actually represents 2 characters. Try to make this character split across // the boundary - var content = new string('a', characterSize - 1) + "𐐀"; + var content = new string('a', characterSize - 1) + "𐐀"; var stream = new TestMemoryStream(); var writer = new HttpResponseStreamWriter(stream, Encoding.Unicode); diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json index 8cfc45ec36..64495c2e19 100644 --- a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json +++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json @@ -9,7 +9,7 @@ }, "testRunner": "xunit", "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", diff --git a/test/Microsoft.Net.Http.Headers.Tests/project.json b/test/Microsoft.Net.Http.Headers.Tests/project.json index 3d2129131d..9a4bc65376 100644 --- a/test/Microsoft.Net.Http.Headers.Tests/project.json +++ b/test/Microsoft.Net.Http.Headers.Tests/project.json @@ -6,7 +6,7 @@ "xunit": "2.2.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*",