diff --git a/samples/DatabaseErrorPageSample/project.json b/samples/DatabaseErrorPageSample/project.json
index dceefc73d3..2dc57af9a4 100644
--- a/samples/DatabaseErrorPageSample/project.json
+++ b/samples/DatabaseErrorPageSample/project.json
@@ -15,8 +15,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {
-      "imports": "portable-net451+win8"
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/samples/DeveloperExceptionPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json
index 3a7fccc9be..f9a3fdb2d6 100644
--- a/samples/DeveloperExceptionPageSample/project.json
+++ b/samples/DeveloperExceptionPageSample/project.json
@@ -12,7 +12,11 @@
     "web": "DeveloperExceptionPageSample"
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/samples/ElmPageSample/project.json b/samples/ElmPageSample/project.json
index 034cc11ba0..79e2d671a5 100644
--- a/samples/ElmPageSample/project.json
+++ b/samples/ElmPageSample/project.json
@@ -14,6 +14,10 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/samples/ExceptionHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json
index 98d64d5419..348e98de20 100644
--- a/samples/ExceptionHandlerSample/project.json
+++ b/samples/ExceptionHandlerSample/project.json
@@ -14,7 +14,11 @@
     "web": "ExceptionHandlerSample"
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/samples/MiddlewareAnalysisSample/project.json b/samples/MiddlewareAnalysisSample/project.json
index 6e83f1432a..f0e452dcf0 100644
--- a/samples/MiddlewareAnalysisSample/project.json
+++ b/samples/MiddlewareAnalysisSample/project.json
@@ -15,7 +15,11 @@
     "web": "MiddlewareAnalysisSample"
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/samples/RuntimeInfoPageSample/project.json b/samples/RuntimeInfoPageSample/project.json
index 3c1c3487c6..82523d20cc 100644
--- a/samples/RuntimeInfoPageSample/project.json
+++ b/samples/RuntimeInfoPageSample/project.json
@@ -14,6 +14,10 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json
index ba78273134..7a35fd5351 100644
--- a/samples/StatusCodePagesSample/project.json
+++ b/samples/StatusCodePagesSample/project.json
@@ -13,7 +13,9 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": { "web": "StatusCodePagesSample" },
+  "commands": {
+    "web": "StatusCodePagesSample"
+  },
   "dependencies": {
     "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
     "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
@@ -21,7 +23,11 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json
index 7e6f6cdbd6..0857e82770 100644
--- a/samples/WelcomePageSample/project.json
+++ b/samples/WelcomePageSample/project.json
@@ -13,6 +13,10 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
index c883f68b5b..6a28c104dd 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
@@ -8,15 +8,20 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Resources.ResourceManager": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
index c155df3488..499f358b55 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
@@ -4,7 +4,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "repository": {
@@ -17,10 +19,13 @@
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Threading": "4.0.11-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   },
   "compileExclude": [
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
index 325a8c453f..89c1eef66f 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
 using System;
-#if DOTNET5_4
+#if NETSTANDARD1_3
 using System.Threading;
 #else
 using System.Runtime.Remoting.Messaging;
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
 {
     public class DataStoreErrorLogger : ILogger
     {
-#if DOTNET5_4
+#if NETSTANDARD1_3
         private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>(); 
 #else
         private const string ContextName = "__DataStoreErrorLog";
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
         {
             get
             {
-#if DOTNET5_4
+#if NETSTANDARD1_3
                 return _log.Value; 
 #else
                 return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName);
@@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
             // it will not be available to code outside of the current async context. 
             // We create it ahead of time so that any cloning just clones the reference
             // to the object that will hold any errors.
-#if DOTNET5_4
+#if NETSTANDARD1_3
             _log.Value = new DataStoreErrorLog();
 #else
             CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
index a0cf0a58b9..4cb9ec39f4 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
@@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
 
             try
             {
-#if !DOTNET5_4
+#if !NETSTANDARD1_3
                 // TODO This probably isn't the correct place for this workaround, it
                 //      needs to be called before anything is written to CallContext
                 // http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
index 1fb8e917f3..8f2cf15ca1 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
@@ -8,7 +8,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
@@ -25,11 +27,14 @@
         "System.Threading.Tasks": ""
       }
     },
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Threading": "4.0.11-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json
index 95264e2bfa..62fb7b83a7 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics/project.json
@@ -4,7 +4,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "repository": {
@@ -22,11 +24,14 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-*"
   },
   "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
+    "net451": {},
+    "netstandard1.3": {
       "dependencies": {
         "System.Reflection.Extensions": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   },
   "compileExclude": [
@@ -34,4 +39,4 @@
     "RuntimeInfo/Views/*.cshtml",
     "WelcomePage/Views/*.cshtml"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
index 69dd7e5264..3c5d8f6049 100644
--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
@@ -4,7 +4,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "repository": {
@@ -16,9 +18,12 @@
     "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
     "System.Diagnostics.DiagnosticSource": "4.0.0-*"
   },
-
   "frameworks": {
-    "net451": { },
-    "dotnet5.4": { }
+    "net451": {},
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/PageGenerator/project.json b/src/PageGenerator/project.json
index 5cc031956a..ff3da9fac1 100644
--- a/src/PageGenerator/project.json
+++ b/src/PageGenerator/project.json
@@ -15,10 +15,13 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
-        "System.Console": "4.0.0-*",
-      }
+        "System.Console": "4.0.0-*"
+      },
+      "imports": [
+        "dnxcore50"
+      ]
     }
   },
   "commands": {
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
index ffe1abed65..9faca98c01 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
@@ -10,11 +10,14 @@
   },
   "testRunner": "xunit",
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     },
     "net451": {
       "frameworkAssemblies": {
@@ -29,4 +32,4 @@
   "compilationOptions": {
     "warningsAsErrors": true
   }
-}
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
index eb6ccd8caa..b08df0b97a 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
@@ -15,12 +15,15 @@
   ],
   "testRunner": "xunit",
   "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": {
@@ -33,4 +36,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
index ebcb91da6c..2b7464636f 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
@@ -22,8 +22,11 @@
     "bower_components"
   ],
   "frameworks": {
-    "dnxcore50": {
-      "imports": "portable-net451+win8",
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ],
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
@@ -40,4 +43,4 @@
     "**.vspscc"
   ],
   "version": "1.0.0-*"
-}
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
index 938d14e4fa..e1f557fd29 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.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": {
@@ -39,4 +42,4 @@
   "resource": [
     "Resources/**"
   ]
-}
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
index 9dce63c8a3..12b06c3b58 100644
--- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
+++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.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": {
@@ -30,4 +33,4 @@
     }
   },
   "testRunner": "xunit"
-}
+}
\ No newline at end of file