huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switching to generations TFMs

This commit is contained in:
Pranav K 2015-10-22 00:20:57 -07:00
parent 2e884f20f7
commit 20f90e9879
7 changed files with 109 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Microsoft.AspNet.Diagnostics.Abstractions/project.json
View File

@ -1,18 +1,20 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 diagnostics middleware abstractions.", "description": "ASP.NET 5 diagnostics middleware abstractions.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/diagnostics" "url": "git://github.com/aspnet/diagnostics"
}, },
"compilationOptions": { "warningsAsErrors": true }, "compilationOptions": {
"frameworks": { "warningsAsErrors": true
"dnx451": { }, },
"dnxcore50": { "frameworks": {
"dependencies": { "net451": {},
"System.Runtime": "4.0.21-beta-*", "dotnet5.4": {
"System.Resources.ResourceManager": "4.0.1-beta-*" "dependencies": {
} "System.Runtime": "4.0.21-beta-*",
} "System.Resources.ResourceManager": "4.0.1-beta-*"
}
} }
} }
}

4
src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs
View File

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

42
src/Microsoft.AspNet.Diagnostics.Elm/project.json
View File

@ -1,21 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 Middleware to capture and display the request logs.", "description": "ASP.NET 5 Middleware to capture and display the request logs.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/diagnostics" "url": "git://github.com/aspnet/diagnostics"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*" "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Threading": "4.0.11-beta-*" "System.Threading": "4.0.11-beta-*"
} }
} }
}, },
"compileExclude": ["Views/*.cshtml"] "compileExclude": [
} "Views/*.cshtml"
]
}

8
src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
View File

@ -6,7 +6,7 @@ using Microsoft.AspNet.Diagnostics.Entity.Utilities;
using Microsoft.Data.Entity.Storage; using Microsoft.Data.Entity.Storage;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
#if DNXCORE50 #if DOTNET5_4
using System.Threading; using System.Threading;
#else #else
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
{ {
public class DataStoreErrorLogger : ILogger public class DataStoreErrorLogger : ILogger
{ {
#if DNXCORE50 #if DOTNET5_4
private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>(); private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>();
#else #else
private const string ContextName = "__DataStoreErrorLog"; private const string ContextName = "__DataStoreErrorLog";
@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
{ {
get get
{ {
#if DNXCORE50 #if DOTNET5_4
return _log.Value; return _log.Value;
#else #else
return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName); 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. // 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 // We create it ahead of time so that any cloning just clones the reference
// to the object that will hold any errors. // to the object that will hold any errors.
#if DNXCORE50 #if DOTNET5_4
_log.Value = new DataStoreErrorLog(); _log.Value = new DataStoreErrorLog();
#else #else
CallContext.LogicalSetData(ContextName, new DataStoreErrorLog()); CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());

2
src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
View File

@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
try try
{ {
#if !DNXCORE50 #if !DOTNET5_4
// TODO This probably isn't the correct place for this workaround, it // TODO This probably isn't the correct place for this workaround, it
// needs to be called before anything is written to CallContext // needs to be called before anything is written to CallContext
// http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx // http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx

54
src/Microsoft.AspNet.Diagnostics.Entity/project.json
View File

@ -1,29 +1,31 @@
{ {
"version": "7.0.0-*", "version": "7.0.0-*",
"description": "ASP.NET 5 Middleware for Entity Framework error pages.", "description": "ASP.NET 5 Middleware for Entity Framework error pages.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/diagnostics" "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": { "dotnet5.4": {
"warningsAsErrors": true "dependencies": {
}, "System.Threading": "4.0.11-beta-*"
"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-*"
}
}
} }
} }
}

64
src/Microsoft.AspNet.Diagnostics/project.json
View File

@ -1,32 +1,36 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 Middleware for exception handling, exception display pages, and diagnostics information.", "description": "ASP.NET 5 Middleware for exception handling, exception display pages, and diagnostics information.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/diagnostics" "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": { "dotnet5.4": {
"Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*", "dependencies": {
"Microsoft.AspNet.FileProviders.Physical": "1.0.0-*", "System.Reflection.Extensions": "4.0.1-beta-*"
"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-*", "compileExclude": [
"Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*", "DeveloperExceptionPage/Views/*.cshtml",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*", "RuntimeInfo/Views/*.cshtml",
"System.Diagnostics.DiagnosticSource": "4.0.0-beta-*" "WelcomePage/Views/*.cshtml"
}, ]
"frameworks": { }
"dnx451": {
"frameworkAssemblies": {
"System.Runtime": ""
}
},
"dnxcore50": {
"dependencies": {
"System.Reflection.Extensions": "4.0.1-beta-*"
}
}
},
"compileExclude": ["DeveloperExceptionPage/Views/*.cshtml", "RuntimeInfo/Views/*.cshtml", "WelcomePage/Views/*.cshtml"]
}