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

Reacting to Hosting changes

This commit is contained in:
Pranav K 2016-06-03 18:24:35 -07:00
parent 09f5be1434
commit 17a41597a6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs
View File

@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https
return certificate2;
}
#if NETSTANDARD1_3
#if NETSTANDARD1_5
// conversion X509Certificate to X509Certificate2 not supported
// https://github.com/dotnet/corefx/issues/4510
return null;

2
src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
View File

@ -23,7 +23,7 @@
},
"frameworks": {
"net451": {},
"netstandard1.3": {
"netstandard1.5": {
"dependencies": {
"System.Net.Security": "4.0.0-*"
},

6
src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
{
public static class TaskUtilities
{
#if NETSTANDARD1_3
#if NETSTANDARD1_5
public static Task CompletedTask = Task.CompletedTask;
#else
public static Task CompletedTask = Task.FromResult<object>(null);
@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
public static Task GetCancelledTask(CancellationToken cancellationToken)
{
#if NETSTANDARD1_3
#if NETSTANDARD1_5
return Task.FromCanceled(cancellationToken);
#else
var tcs = new TaskCompletionSource<object>();
@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure
public static Task<int> GetCancelledZeroTask(CancellationToken cancellationToken = default(CancellationToken))
{
#if NETSTANDARD1_3
#if NETSTANDARD1_5
// Make sure cancellationToken is cancelled before passing to Task.FromCanceled
if (!cancellationToken.IsCancellationRequested)
{

2
src/Microsoft.AspNetCore.Server.Kestrel/project.json
View File

@ -31,7 +31,7 @@
}
}
},
"netstandard1.3": {
"netstandard1.5": {
"dependencies": {
"System.Collections": "4.0.11-*",
"System.Diagnostics.Debug": "4.0.11-*",