Switching to generations TFMs

src/Microsoft.AspNet.Diagnostics.Abstractions/project.json

@@ -5,10 +5,12 @@
     "type": "git",
     "url": "git://github.com/aspnet/diagnostics"
   },
-	"compilationOptions": { "warningsAsErrors": true },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
   "frameworks": {
-        "dnx451": { },
+    "net451": {},
-        "dnxcore50": {
+    "dotnet5.4": {
       "dependencies": {
         "System.Runtime": "4.0.21-beta-*",
         "System.Resources.ResourceManager": "4.0.1-beta-*"

src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs

@@ -1,5 +1,5 @@
 using System;
-#if DNX451
+#if NET451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
 
         public ScopeNode Node { get; set; }
 
-#if DNX451
+#if NET451
         private static string FieldKey = typeof(ElmScope).FullName + ".Value";
         public static ElmScope Current
         {

src/Microsoft.AspNet.Diagnostics.Elm/project.json

@@ -10,12 +10,14 @@
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
   },
   "frameworks": {
-        "dnx451": { },
+    "net451": {},
-        "dnxcore50": {
+    "dotnet5.4": {
       "dependencies": {
         "System.Threading": "4.0.11-beta-*"
       }
     }
   },
-    "compileExclude": ["Views/*.cshtml"]
+  "compileExclude": [
+    "Views/*.cshtml"
+  ]
 }

src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNet.Diagnostics.Entity.Utilities;
 using Microsoft.Data.Entity.Storage;
 using Microsoft.Extensions.Logging;
 using System;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Threading;
 #else
 using System.Runtime.Remoting.Messaging;
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
 {
     public class DataStoreErrorLogger : ILogger
     {
-#if DNXCORE50
+#if DOTNET5_4
         private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>(); 
 #else
         private const string ContextName = "__DataStoreErrorLog";
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
         {
             get
             {
-#if DNXCORE50
+#if DOTNET5_4
                 return _log.Value; 
 #else
                 return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName);
@@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
             // 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 DNXCORE50
+#if DOTNET5_4
             _log.Value = new DataStoreErrorLog();
 #else
             CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());

src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs

@@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
 
             try
             {
-#if !DNXCORE50
+#if !DOTNET5_4
                 // 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

src/Microsoft.AspNet.Diagnostics.Entity/project.json

@@ -12,15 +12,17 @@
     "Microsoft.AspNet.Diagnostics": "1.0.0-*",
     "EntityFramework.Relational": "7.0.0-*"
   },
-    "compile": [ "..\\Shared\\*.cs" ],
+  "compile": [
+    "..\\Shared\\*.cs"
+  ],
   "frameworks": {
-        "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Configuration": "",
         "System.Threading.Tasks": ""
       }
     },
-        "dnxcore50": {
+    "dotnet5.4": {
       "dependencies": {
         "System.Threading": "4.0.11-beta-*"
       }

src/Microsoft.AspNet.Diagnostics/project.json

@@ -17,16 +17,20 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-beta-*"
   },
   "frameworks": {
-        "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Runtime": ""
       }
     },
-        "dnxcore50": {
+    "dotnet5.4": {
       "dependencies": {
         "System.Reflection.Extensions": "4.0.1-beta-*"
       }
     }
   },
-    "compileExclude": ["DeveloperExceptionPage/Views/*.cshtml", "RuntimeInfo/Views/*.cshtml", "WelcomePage/Views/*.cshtml"]
+  "compileExclude": [
+    "DeveloperExceptionPage/Views/*.cshtml",
+    "RuntimeInfo/Views/*.cshtml",
+    "WelcomePage/Views/*.cshtml"
+  ]
 }