huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating to netcoreapp1.1

This commit is contained in:
Pranav K 2016-10-12 13:46:53 -07:00
parent 5768f9605e
commit 21fbdcc476
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/HelloWorld/project.json
View File

@ -10,7 +10,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",

2
samples/HotAddSample/project.json
View File

@ -11,7 +11,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",

2
samples/SelfHostServer/project.json
View File

@ -11,7 +11,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",

2
test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/RequestBodyTests.cs
View File

@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.WebListener
Assert.Equal("Hello World", response); Assert.Equal("Hello World", response);
} }
} }
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
[ConditionalFact] [ConditionalFact]
public async Task RequestBody_ReadBeginEnd_Success() public async Task RequestBody_ReadBeginEnd_Success()
{ {

4
test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
View File

@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.WebListener
Assert.Equal(0, response.ContentLength); Assert.Equal(0, response.ContentLength);
Assert.NotNull(response.Headers["Date"]); Assert.NotNull(response.Headers["Date"]);
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR. #if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]); Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]);
#else #else
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate")); Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate"));
@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.WebListener
Assert.Equal(0, response.ContentLength); Assert.Equal(0, response.ContentLength);
Assert.NotNull(response.Headers["Date"]); Assert.NotNull(response.Headers["Date"]);
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR. #if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]); Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]);
#else #else
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1")); Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1"));

2
test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json
View File

@ -11,7 +11,7 @@
"xunit": "2.2.0-*" "xunit": "2.2.0-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",

2
test/Microsoft.Net.Http.Server.FunctionalTests/ResponseBodyTests.cs
View File

@ -129,7 +129,7 @@ namespace Microsoft.Net.Http.Server
var context = await server.AcceptAsync(); var context = await server.AcceptAsync();
context.Response.Headers["Content-lenGth"] = " 20 "; context.Response.Headers["Content-lenGth"] = " 20 ";
context.Dispose(); context.Dispose();
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
// HttpClient retries the request because it didn't get a response. // HttpClient retries the request because it didn't get a response.
context = await server.AcceptAsync(); context = await server.AcceptAsync();
context.Response.Headers["Content-lenGth"] = " 20 "; context.Response.Headers["Content-lenGth"] = " 20 ";

4
test/Microsoft.Net.Http.Server.FunctionalTests/ResponseHeaderTests.cs
View File

@ -221,7 +221,7 @@ namespace Microsoft.Net.Http.Server
Assert.Equal(0, response.ContentLength); Assert.Equal(0, response.ContentLength);
Assert.NotNull(response.Headers["Date"]); Assert.NotNull(response.Headers["Date"]);
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR. #if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]); Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]);
#else #else
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate")); Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate"));
@ -250,7 +250,7 @@ namespace Microsoft.Net.Http.Server
Assert.Equal(0, response.ContentLength); Assert.Equal(0, response.ContentLength);
Assert.NotNull(response.Headers["Date"]); Assert.NotNull(response.Headers["Date"]);
Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
#if NETCOREAPP1_0 // WebHeaderCollection.GetValues() not available in CoreCLR. #if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]); Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]);
#else #else
Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1")); Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1"));

2
test/Microsoft.Net.Http.Server.FunctionalTests/ServerTests.cs
View File

@ -186,7 +186,7 @@ namespace Microsoft.Net.Http.Server
context.Abort(); context.Abort();
Assert.True(canceled.WaitOne(interval), "Aborted"); Assert.True(canceled.WaitOne(interval), "Aborted");
Assert.True(ct.IsCancellationRequested, "IsCancellationRequested"); Assert.True(ct.IsCancellationRequested, "IsCancellationRequested");
#if !NETCOREAPP1_0 #if !NETCOREAPP1_1
// HttpClient re-tries the request because it doesn't know if the request was received. // HttpClient re-tries the request because it doesn't know if the request was received.
context = await server.AcceptAsync(); context = await server.AcceptAsync();
context.Abort(); context.Abort();

2
test/Microsoft.Net.Http.Server.FunctionalTests/project.json
View File

@ -7,7 +7,7 @@
"xunit": "2.2.0-*" "xunit": "2.2.0-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",

2
test/Microsoft.Net.Http.Server.Tests/project.json
View File

@ -6,7 +6,7 @@
"xunit": "2.2.0-*" "xunit": "2.2.0-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.1": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.1.0-*", "version": "1.1.0-*",