From 17a41597a6e62829b33510c025c281cf3759f159 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 3 Jun 2016 18:24:35 -0700
Subject: [PATCH] Reacting to Hosting changes

---
 .../HttpsConnectionFilter.cs                                | 2 +-
 src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json  | 2 +-
 .../Internal/Infrastructure/TaskUtilities.cs                | 6 +++---
 src/Microsoft.AspNetCore.Server.Kestrel/project.json        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs
index f8efc1abbb..f553c825e5 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionFilter.cs
@@ -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;
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json b/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
index 3c74d74e93..9d4d5909a0 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
@@ -23,7 +23,7 @@
   },
   "frameworks": {
     "net451": {},
-    "netstandard1.3": {
+    "netstandard1.5": {
       "dependencies": {
         "System.Net.Security": "4.0.0-*"
       },
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs
index 139411bca0..4242379271 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Infrastructure/TaskUtilities.cs
@@ -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)
             {
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/project.json b/src/Microsoft.AspNetCore.Server.Kestrel/project.json
index f6aeb0f17b..7c187970ee 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/project.json
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/project.json
@@ -31,7 +31,7 @@
         }
       }
     },
-    "netstandard1.3": {
+    "netstandard1.5": {
       "dependencies": {
         "System.Collections": "4.0.11-*",
         "System.Diagnostics.Debug": "4.0.11-*",