Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.

Commit 336ff5c

Browse files
committed
Revert "Updating to netcoreapp1.1"
This reverts commit 21fbdcc.
1 parent 21fbdcc commit 336ff5c

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

samples/HelloWorld/project.json

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

samples/HotAddSample/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"frameworks": {
1313
"net451": {},
14-
"netcoreapp1.1": {
14+
"netcoreapp1.0": {
1515
"dependencies": {
1616
"Microsoft.NETCore.App": {
1717
"version": "1.1.0-*",

samples/SelfHostServer/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"frameworks": {
1313
"net451": {},
14-
"netcoreapp1.1": {
14+
"netcoreapp1.0": {
1515
"dependencies": {
1616
"Microsoft.NETCore.App": {
1717
"version": "1.1.0-*",

test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task RequestBody_ReadAync_Success()
5050
Assert.Equal("Hello World", response);
5151
}
5252
}
53-
#if !NETCOREAPP1_1
53+
#if !NETCOREAPP1_0
5454
[ConditionalFact]
5555
public async Task RequestBody_ReadBeginEnd_Success()
5656
{

test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public async Task ResponseHeaders_ServerSendsMultiValueKnownHeaders_Success()
8181
Assert.Equal(0, response.ContentLength);
8282
Assert.NotNull(response.Headers["Date"]);
8383
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
84-
#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
84+
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
8585
Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]);
8686
#else
8787
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate"));
@@ -109,7 +109,7 @@ public async Task ResponseHeaders_ServerSendsCustomHeaders_Success()
109109
Assert.Equal(0, response.ContentLength);
110110
Assert.NotNull(response.Headers["Date"]);
111111
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
112-
#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
112+
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
113113
Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]);
114114
#else
115115
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1"));

test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json

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

test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public async Task ResponseBody_WriteContentLengthNoneWritten_Aborts()
129129
var context = await server.AcceptAsync();
130130
context.Response.Headers["Content-lenGth"] = " 20 ";
131131
context.Dispose();
132-
#if !NETCOREAPP1_1
132+
#if !NETCOREAPP1_0
133133
// HttpClient retries the request because it didn't get a response.
134134
context = await server.AcceptAsync();
135135
context.Response.Headers["Content-lenGth"] = " 20 ";

test/Microsoft.Net.Http.Server.FunctionalTests/ResponseHeaderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public async Task ResponseHeaders_ServerSendsMultiValueKnownHeaders_Success()
221221
Assert.Equal(0, response.ContentLength);
222222
Assert.NotNull(response.Headers["Date"]);
223223
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
224-
#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
224+
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
225225
Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]);
226226
#else
227227
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate"));
@@ -250,7 +250,7 @@ public async Task ResponseHeaders_ServerSendsCustomHeaders_Success()
250250
Assert.Equal(0, response.ContentLength);
251251
Assert.NotNull(response.Headers["Date"]);
252252
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
253-
#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
253+
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
254254
Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]);
255255
#else
256256
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1"));

test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public async Task Server_Abort_CallCanceled()
186186
context.Abort();
187187
Assert.True(canceled.WaitOne(interval), "Aborted");
188188
Assert.True(ct.IsCancellationRequested, "IsCancellationRequested");
189-
#if !NETCOREAPP1_1
189+
#if !NETCOREAPP1_0
190190
// HttpClient re-tries the request because it doesn't know if the request was received.
191191
context = await server.AcceptAsync();
192192
context.Abort();

test/Microsoft.Net.Http.Server.FunctionalTests/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-*",

0 commit comments

Comments
 (0)