From 20f90e987931e27bf6b8062d35238d292f9af0c9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 22 Oct 2015 00:20:57 -0700 Subject: [PATCH] Switching to generations TFMs --- .../project.json | 34 +++++----- .../ElmScope.cs | 4 +- .../project.json | 42 ++++++------ .../DataStoreErrorLogger.cs | 8 +-- .../DatabaseErrorPageMiddleware.cs | 2 +- .../project.json | 54 ++++++++-------- src/Microsoft.AspNet.Diagnostics/project.json | 64 ++++++++++--------- 7 files changed, 109 insertions(+), 99 deletions(-) diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNet.Diagnostics.Abstractions/project.json index 555a3b59d4..33fc75645a 100644 --- a/src/Microsoft.AspNet.Diagnostics.Abstractions/project.json +++ b/src/Microsoft.AspNet.Diagnostics.Abstractions/project.json @@ -1,18 +1,20 @@ { - "version": "1.0.0-*", - "description": "ASP.NET 5 diagnostics middleware abstractions.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "compilationOptions": { "warningsAsErrors": true }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": { - "System.Runtime": "4.0.21-beta-*", - "System.Resources.ResourceManager": "4.0.1-beta-*" - } - } + "version": "1.0.0-*", + "description": "ASP.NET 5 diagnostics middleware abstractions.", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "compilationOptions": { + "warningsAsErrors": true + }, + "frameworks": { + "net451": {}, + "dotnet5.4": { + "dependencies": { + "System.Runtime": "4.0.21-beta-*", + "System.Resources.ResourceManager": "4.0.1-beta-*" + } } -} + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs index e45d10607d..a2a97a6547 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/project.json b/src/Microsoft.AspNet.Diagnostics.Elm/project.json index 6adf371510..0b62d53ec3 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/project.json +++ b/src/Microsoft.AspNet.Diagnostics.Elm/project.json @@ -1,21 +1,23 @@ { - "version": "1.0.0-*", - "description": "ASP.NET 5 Middleware to capture and display the request logs.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" - }, - "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*" - }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": { - "System.Threading": "4.0.11-beta-*" - } - } - }, - "compileExclude": ["Views/*.cshtml"] -} + "version": "1.0.0-*", + "description": "ASP.NET 5 Middleware to capture and display the request logs.", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "dependencies": { + "Microsoft.AspNet.Diagnostics": "1.0.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*" + }, + "frameworks": { + "net451": {}, + "dotnet5.4": { + "dependencies": { + "System.Threading": "4.0.11-beta-*" + } + } + }, + "compileExclude": [ + "Views/*.cshtml" + ] +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs index cddb13761d..1fc27090b1 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs +++ b/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 _log = new AsyncLocal(); #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()); diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs index a0cc65f002..a105563590 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/project.json b/src/Microsoft.AspNet.Diagnostics.Entity/project.json index f4fb18e9df..9571f83335 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/project.json +++ b/src/Microsoft.AspNet.Diagnostics.Entity/project.json @@ -1,29 +1,31 @@ { - "version": "7.0.0-*", - "description": "ASP.NET 5 Middleware for Entity Framework error pages.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "version": "7.0.0-*", + "description": "ASP.NET 5 Middleware for Entity Framework error pages.", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "compilationOptions": { + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.AspNet.Diagnostics": "1.0.0-*", + "EntityFramework.Relational": "7.0.0-*" + }, + "compile": [ + "..\\Shared\\*.cs" + ], + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Configuration": "", + "System.Threading.Tasks": "" + } }, - "compilationOptions": { - "warningsAsErrors": true - }, - "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "EntityFramework.Relational": "7.0.0-*" - }, - "compile": [ "..\\Shared\\*.cs" ], - "frameworks": { - "dnx451": { - "frameworkAssemblies": { - "System.Configuration": "", - "System.Threading.Tasks": "" - } - }, - "dnxcore50": { - "dependencies": { - "System.Threading": "4.0.11-beta-*" - } - } + "dotnet5.4": { + "dependencies": { + "System.Threading": "4.0.11-beta-*" + } } -} + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Diagnostics/project.json b/src/Microsoft.AspNet.Diagnostics/project.json index 6eaaae3d63..517d9626fb 100644 --- a/src/Microsoft.AspNet.Diagnostics/project.json +++ b/src/Microsoft.AspNet.Diagnostics/project.json @@ -1,32 +1,36 @@ { - "version": "1.0.0-*", - "description": "ASP.NET 5 Middleware for exception handling, exception display pages, and diagnostics information.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "version": "1.0.0-*", + "description": "ASP.NET 5 Middleware for exception handling, exception display pages, and diagnostics information.", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "dependencies": { + "Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*", + "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*", + "Microsoft.AspNet.Http.Extensions": "1.0.0-*", + "Microsoft.AspNet.WebUtilities": "1.0.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", + "Microsoft.Extensions.OptionsModel": "1.0.0-*", + "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*", + "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*", + "System.Diagnostics.DiagnosticSource": "4.0.0-beta-*" + }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "" + } }, - "dependencies": { - "Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*", - "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*", - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.AspNet.WebUtilities": "1.0.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", - "Microsoft.Extensions.OptionsModel": "1.0.0-*", - "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*", - "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*", - "System.Diagnostics.DiagnosticSource": "4.0.0-beta-*" - }, - "frameworks": { - "dnx451": { - "frameworkAssemblies": { - "System.Runtime": "" - } - }, - "dnxcore50": { - "dependencies": { - "System.Reflection.Extensions": "4.0.1-beta-*" - } - } - }, - "compileExclude": ["DeveloperExceptionPage/Views/*.cshtml", "RuntimeInfo/Views/*.cshtml", "WelcomePage/Views/*.cshtml"] -} + "dotnet5.4": { + "dependencies": { + "System.Reflection.Extensions": "4.0.1-beta-*" + } + } + }, + "compileExclude": [ + "DeveloperExceptionPage/Views/*.cshtml", + "RuntimeInfo/Views/*.cshtml", + "WelcomePage/Views/*.cshtml" + ] +} \ No newline at end of file