Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 11a67b8

Browse files
committed
Revert "Updating to netcoreapp1.1"
This reverts commit 6d5cd28.
1 parent 6d5cd28 commit 11a67b8

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

samples/SampleApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"frameworks": {
88
"net451": {},
9-
"netcoreapp1.1": {
9+
"netcoreapp1.0": {
1010
"dependencies": {
1111
"Microsoft.NETCore.App": {
1212
"version": "1.1.0-*",

test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"xunit": "2.2.0-*"
1111
},
1212
"frameworks": {
13-
"netcoreapp1.1": {
13+
"netcoreapp1.0": {
1414
"dependencies": {
1515
"Microsoft.NETCore.App": {
1616
"version": "1.1.0-*",

test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"xunit": "2.2.0-*"
88
},
99
"frameworks": {
10-
"netcoreapp1.1": {
10+
"netcoreapp1.0": {
1111
"dependencies": {
1212
"Microsoft.NETCore.App": {
1313
"version": "1.1.0-*",

test/Microsoft.AspNetCore.Http.Features.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"xunit": "2.2.0-*"
66
},
77
"frameworks": {
8-
"netcoreapp1.1": {
8+
"netcoreapp1.0": {
99
"dependencies": {
1010
"Microsoft.NETCore.App": {
1111
"version": "1.1.0-*",

test/Microsoft.AspNetCore.Http.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"xunit": "2.2.0-*"
66
},
77
"frameworks": {
8-
"netcoreapp1.1": {
8+
"netcoreapp1.0": {
99
"dependencies": {
1010
"Microsoft.NETCore.App": {
1111
"version": "1.1.0-*",

test/Microsoft.AspNetCore.Owin.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"xunit": "2.2.0-*"
88
},
99
"frameworks": {
10-
"netcoreapp1.1": {
10+
"netcoreapp1.0": {
1111
"dependencies": {
1212
"Microsoft.NETCore.App": {
1313
"version": "1.1.0-*",

test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -336,13 +336,13 @@ public async Task WriteCharArrayAsync_WritesToStream(int byteLength)
336336
}
337337

338338
[Theory]
339-
[InlineData("你好世界", "utf-16")]
340-
#if !NETCOREAPP1_1
339+
[InlineData("你好世界", "utf-16")]
340+
#if !NETCOREAPP1_0
341341
// CoreCLR does not like shift_jis as an encoding.
342-
[InlineData("こんにちは世界", "shift_jis")]
342+
[InlineData("こんにちは世界", "shift_jis")]
343343
#endif
344-
[InlineData("హలో ప్రపంచ", "iso-8859-1")]
345-
[InlineData("வணக்கம் உலக", "utf-32")]
344+
[InlineData("హలో ప్రపంచ", "iso-8859-1")]
345+
[InlineData("வணக்கம் உலக", "utf-32")]
346346
public async Task WritesData_InExpectedEncoding(string data, string encodingName)
347347
{
348348
// Arrange
@@ -362,24 +362,24 @@ public async Task WritesData_InExpectedEncoding(string data, string encodingName
362362
}
363363

364364
[Theory]
365-
[InlineData('ã‚“', 1023, "utf-8")]
366-
[InlineData('ã‚“', 1024, "utf-8")]
367-
[InlineData('ã‚“', 1050, "utf-8")]
368-
[InlineData('ä½ ', 1023, "utf-16")]
369-
[InlineData('ä½ ', 1024, "utf-16")]
370-
[InlineData('ä½ ', 1050, "utf-16")]
371-
#if !NETCOREAPP1_1
365+
[InlineData('', 1023, "utf-8")]
366+
[InlineData('', 1024, "utf-8")]
367+
[InlineData('', 1050, "utf-8")]
368+
[InlineData('', 1023, "utf-16")]
369+
[InlineData('', 1024, "utf-16")]
370+
[InlineData('', 1050, "utf-16")]
371+
#if !NETCOREAPP1_0
372372
// CoreCLR does not like shift_jis as an encoding.
373-
[InlineData('こ', 1023, "shift_jis")]
374-
[InlineData('こ', 1024, "shift_jis")]
375-
[InlineData('こ', 1050, "shift_jis")]
373+
[InlineData('', 1023, "shift_jis")]
374+
[InlineData('', 1024, "shift_jis")]
375+
[InlineData('', 1050, "shift_jis")]
376376
#endif
377-
[InlineData('à°¹', 1023, "iso-8859-1")]
378-
[InlineData('à°¹', 1024, "iso-8859-1")]
379-
[InlineData('à°¹', 1050, "iso-8859-1")]
380-
[InlineData('வ', 1023, "utf-32")]
381-
[InlineData('வ', 1024, "utf-32")]
382-
[InlineData('வ', 1050, "utf-32")]
377+
[InlineData('', 1023, "iso-8859-1")]
378+
[InlineData('', 1024, "iso-8859-1")]
379+
[InlineData('', 1050, "iso-8859-1")]
380+
[InlineData('', 1023, "utf-32")]
381+
[InlineData('', 1024, "utf-32")]
382+
[InlineData('', 1050, "utf-32")]
383383
public async Task WritesData_OfDifferentLength_InExpectedEncoding(
384384
char character,
385385
int charCount,
@@ -437,9 +437,9 @@ public void HttpResponseStreamWriter_UsingPooledBuffers()
437437
public async Task HttpResponseStreamWriter_WritesDataCorrectly_ForCharactersHavingSurrogatePairs(int characterSize)
438438
{
439439
// Arrange
440-
// Here "𐐀" (called Deseret Long I) actually represents 2 characters. Try to make this character split across
440+
// Here "𐐀" (called Deseret Long I) actually represents 2 characters. Try to make this character split across
441441
// the boundary
442-
var content = new string('a', characterSize - 1) + "𐐀";
442+
var content = new string('a', characterSize - 1) + "𐐀";
443443
var stream = new TestMemoryStream();
444444
var writer = new HttpResponseStreamWriter(stream, Encoding.Unicode);
445445

test/Microsoft.AspNetCore.WebUtilities.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"testRunner": "xunit",
1111
"frameworks": {
12-
"netcoreapp1.1": {
12+
"netcoreapp1.0": {
1313
"dependencies": {
1414
"Microsoft.NETCore.App": {
1515
"version": "1.1.0-*",

test/Microsoft.Net.Http.Headers.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"xunit": "2.2.0-*"
77
},
88
"frameworks": {
9-
"netcoreapp1.1": {
9+
"netcoreapp1.0": {
1010
"dependencies": {
1111
"Microsoft.NETCore.App": {
1212
"version": "1.1.0-*",

0 commit comments

Comments
 (0)