diff --git a/src/Microsoft.AspNet.Server.Kestrel.Https/project.json b/src/Microsoft.AspNet.Server.Kestrel.Https/project.json
index 2fc29ec1db..2e29e1ac44 100644
--- a/src/Microsoft.AspNet.Server.Kestrel.Https/project.json
+++ b/src/Microsoft.AspNet.Server.Kestrel.Https/project.json
@@ -1,14 +1,14 @@
-{
-    "version": "1.0.0-*",
-    "description": "Adds HTTPS support to Kestrel",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/kestrelhttpserver"
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
-    },
-    "frameworks": {
-        "dnx451": { }
-    }
-}
+{
+  "version": "1.0.0-*",
+  "description": "Adds HTTPS support to Kestrel",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/kestrelhttpserver"
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": { }
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
index 40e860f20e..d421be7e0d 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNX451
+#if NET451
 using System;
 #endif
 using System.IO;
@@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             }
         }
 
-#if DNX451
+#if NET451
         public override void Close()
         {
             _requestStream.Close();
@@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             return _responseStream.FlushAsync(cancellationToken);
         }
 
-#if DNX451
+#if NET451
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return _requestStream.BeginRead(buffer, offset, count, callback, state);
@@ -146,7 +146,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken);
         }
 
-#if DNX451
+#if NET451
         public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return _responseStream.BeginWrite(buffer, offset, count, callback, state);
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
index 3bf79ca3cc..714728dd43 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
@@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             return ReadAsync(buffer, offset, count).Result;
         }
 
-#if DNX451
+#if NET451
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             var task = ReadAsync(buffer, offset, count, CancellationToken.None, state);
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs
index 69281fddae..6c26ec71b1 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs
@@ -67,7 +67,7 @@ namespace Microsoft.AspNet.Server.Kestrel
                     Post(OnStopImmediate, null);
                     if (!_thread.Join((int)timeout.TotalMilliseconds))
                     {
-#if DNX451
+#if NET451
                         _thread.Abort();
 #endif
                     }
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs b/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
index b2e34c5aeb..7b13ccdd9c 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
     {
         public static bool IsWindows()
         {
-#if DNXCORE50
+#if DOTNET5_4 || DNXCORE50
             // Until Environment.OSVersion.Platform is exposed on .NET Core, we
             // try to call uname and if that fails we assume we are on Windows.
             return GetUname() == string.Empty;
diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json
index f726255872..24e5f01b8f 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/project.json
+++ b/src/Microsoft.AspNet.Server.Kestrel/project.json
@@ -16,7 +16,7 @@
     },
     "Microsoft.AspNet.Internal.libuv-Darwin": {
       "version": "1.0.0-*",
-        "type":"build"
+      "type": "build"
     },
     "Microsoft.AspNet.Internal.libuv-Windows": {
       "version": "1.0.0-*",
@@ -25,6 +25,7 @@
   },
   "frameworks": {
     "dnx451": { },
+    "net451": { },
     "dnxcore50": {
       "dependencies": {
         "System.Collections": "4.0.11-beta-*",
@@ -44,6 +45,26 @@
         "System.Threading.ThreadPool": "4.0.10-beta-*",
         "System.Threading.Timer": "4.0.1-beta-*"
       }
+    },
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Collections": "4.0.11-beta-*",
+        "System.Diagnostics.Debug": "4.0.11-beta-*",
+        "System.Diagnostics.TraceSource": "4.0.0-beta-*",
+        "System.Diagnostics.Tracing": "4.0.21-beta-*",
+        "System.Globalization": "4.0.11-beta-*",
+        "System.IO": "4.0.11-beta-*",
+        "System.Linq": "4.0.1-beta-*",
+        "System.Net.Primitives": "4.0.11-beta-*",
+        "System.Runtime.Extensions": "4.0.11-beta-*",
+        "System.Runtime.InteropServices": "4.0.21-beta-*",
+        "System.Text.Encoding": "4.0.11-beta-*",
+        "System.Threading": "4.0.11-beta-*",
+        "System.Threading.Tasks": "4.0.11-beta-*",
+        "System.Threading.Thread": "4.0.0-beta-*",
+        "System.Threading.ThreadPool": "4.0.10-beta-*",
+        "System.Threading.Timer": "4.0.1-beta-*"
+      }
     }
   },
   "compilationOptions": {
@@ -64,6 +85,6 @@
     "runtimes/win7-x64/native/": "runtimes/win7-x64/native/*",
     "runtimes/win7-x86/native/": "runtimes/win7-x86/native/*",
     "runtimes/win10-arm/native/": "runtimes/win10-arm/native/*",
-    "runtimes/osx/native/":  "runtimes/osx/native/*"
+    "runtimes/osx/native/": "runtimes/osx/native/*"
   }
-}
+}
\ No newline at end of file
diff --git a/tools/Microsoft.StandardsPolice/project.json b/tools/Microsoft.StandardsPolice/project.json
index 0129749b3f..63a14295ff 100644
--- a/tools/Microsoft.StandardsPolice/project.json
+++ b/tools/Microsoft.StandardsPolice/project.json
@@ -1,28 +1,40 @@
 {
-    "version": "1.0.0-*",
+  "version": "1.0.0-*",
 
-    "description": "Microsoft.StandardsPolice Class Library",
+  "description": "Microsoft.StandardsPolice Class Library",
 
-    "dependencies": {
-        "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
+  "dependencies": {
+    "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
+  },
+
+  "commands": {
+    "Microsoft.StandardsPolice": "Microsoft.StandardsPolice"
+  },
+
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Runtime": "",
+        "System.Text.Encoding": "",
+        "System.Threading.Tasks": ""
+      }
     },
-
-    "commands": {
-        "Microsoft.StandardsPolice": "Microsoft.StandardsPolice"
+    "dnx451": {
+      "frameworkAssemblies": {
+        "System.Runtime": "",
+        "System.Text.Encoding": "",
+        "System.Threading.Tasks": ""
+      }
     },
-
-    "frameworks": {
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.Runtime": "",
-                "System.Text.Encoding": "",
-                "System.Threading.Tasks": ""
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Console": "4.0.0-beta-*"
-            }
-        }
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Console": "4.0.0-beta-*"
+      }
+    },
+    "dnxcore50": {
+      "dependencies": {
+        "System.Console": "4.0.0-beta-*"
+      }
     }
+  }
 }