From bb7cb4a0d9873febde2e53b111aed468f247e3fc Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Tue, 1 Mar 2016 13:37:03 -0800
Subject: [PATCH] Transition to netstandard.

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.
---
 samples/RoutingSample.Web/project.json          | 11 +++++++----
 .../project.json                                | 15 ++++++++++-----
 .../project.json                                | 12 +++++++-----
 .../Internal/TaskCache.cs                       |  2 +-
 src/Microsoft.AspNetCore.Routing/project.json   | 17 +++++++++++------
 .../project.json                                |  7 +++++--
 .../project.json                                |  7 +++++--
 .../project.json                                |  7 +++++--
 8 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/samples/RoutingSample.Web/project.json b/samples/RoutingSample.Web/project.json
index 2ab6883e33..10a128a1d3 100644
--- a/samples/RoutingSample.Web/project.json
+++ b/samples/RoutingSample.Web/project.json
@@ -12,9 +12,12 @@
     "web": "RoutingSample.Web"
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": {
-      "imports": "portable-net451+win8"
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/project.json b/src/Microsoft.AspNetCore.Routing.Abstractions/project.json
index 65f988ed8f..1382910ae8 100644
--- a/src/Microsoft.AspNetCore.Routing.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Routing.Abstractions/project.json
@@ -8,7 +8,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
@@ -19,13 +21,16 @@
     }
   },
   "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
+    "net451": {},
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections.Concurrent": "4.0.12-*",
         "System.Threading.Tasks": "4.0.11-*",
         "System.Reflection.Extensions": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/project.json b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/project.json
index a771fe26db..c350f6a48a 100644
--- a/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/project.json
+++ b/src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/project.json
@@ -11,10 +11,12 @@
   },
   "shared": "**/*.cs",
   "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
-      "dependencies": {
-      }
+    "net451": {},
+    "netstandard1.3": {
+      "dependencies": {},
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs b/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs
index dfdda56896..7e06fec35e 100644
--- a/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs
+++ b/src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Routing.Internal
 {
     public static class TaskCache
     {
-#if DOTNET5_4
+#if NETSTANDARD1_3
         public static readonly Task CompletedTask = Task.CompletedTask;
 #else
         public static readonly Task CompletedTask = Task.FromResult(0);
diff --git a/src/Microsoft.AspNetCore.Routing/project.json b/src/Microsoft.AspNetCore.Routing/project.json
index df7e11397c..8e0b49a3fc 100644
--- a/src/Microsoft.AspNetCore.Routing/project.json
+++ b/src/Microsoft.AspNetCore.Routing/project.json
@@ -8,7 +8,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
@@ -31,12 +33,15 @@
     }
   },
   "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
+    "net451": {},
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.11-*",
-        "System.Text.RegularExpressions": "4.0.12-*",
-      }
+        "System.Text.RegularExpressions": "4.0.12-*"
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json
index a327bd910d..975b520bf0 100644
--- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json
@@ -9,12 +9,15 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
         "moq.netcore": "4.4.0-beta8",
         "dotnet-test-xunit": "1.0.0-dev-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     },
     "net451": {
       "frameworkAssemblies": {
diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json
index 4eabf30875..cdab0351ff 100644
--- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json
@@ -13,11 +13,14 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     },
     "net451": {
       "frameworkAssemblies": {
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/project.json b/test/Microsoft.AspNetCore.Routing.Tests/project.json
index f9b7c91e0f..5b102d2970 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Routing.Tests/project.json
@@ -14,12 +14,15 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
         "moq.netcore": "4.4.0-beta8",
         "dotnet-test-xunit": "1.0.0-dev-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     },
     "net451": {
       "frameworkAssemblies": {