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

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:48:36 -07:00
parent 34182987a6
commit 684983effb
18 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ErrorHandlerSample/project.json
View File

@ -12,7 +12,7 @@
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000" "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000"
}, },
"frameworks": { "frameworks": {
"aspnet50" : { }, "dnx451" : { },
"aspnetcore50" : { } "dnxcore50" : { }
} }
} }

6
samples/ErrorPageSample/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@ -6,7 +6,7 @@
}, },
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" }, "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": {} "dnxcore50": {}
} }
} }

6
samples/RuntimeInfoPageSample/project.json
View File

@ -1,4 +1,4 @@
{ {
"webroot" : "wwwroot", "webroot" : "wwwroot",
"exclude": "wwwroot/**/*.*", "exclude": "wwwroot/**/*.*",
"dependencies": { "dependencies": {
@ -6,7 +6,7 @@
"Microsoft.AspNet.Server.IIS": "1.0.0-*" "Microsoft.AspNet.Server.IIS": "1.0.0-*"
}, },
"frameworks" : { "frameworks" : {
"aspnet50" : { }, "dnx451" : { },
"aspnetcore50" : { } "dnxcore50" : { }
} }
} }

4
samples/StatusCodePagesSample/project.json
View File

@ -18,7 +18,7 @@
"Microsoft.AspNet.Server.WebListener": "1.0.0-*" "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
}, },
"frameworks" : { "frameworks" : {
"aspnet50" : { }, "dnx451" : { },
"aspnetcore50" : { } "dnxcore50" : { }
} }
} }

6
samples/WelcomePageSample/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "", "Microsoft.AspNet.Diagnostics": "",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@ -6,7 +6,7 @@
}, },
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" }, "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": {} "dnxcore50": {}
} }
} }

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

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

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

@ -6,11 +6,11 @@
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Threading": "4.0.10-beta-*" "System.Threading": "4.0.10-beta-*"
} }
} }
} }
} }

10
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.Framework.Logging; using Microsoft.Framework.Logging;
using System; using System;
#if ASPNETCORE50 #if DNXCORE50
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 ASPNETCORE50 #if DNXCORE50
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 ASPNETCORE50 #if DNXCORE50
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 ASPNETCORE50 #if DNXCORE50
_log.Value = new DataStoreErrorLog(); _log.Value = new DataStoreErrorLog();
#else #else
CallContext.LogicalSetData(ContextName, new DataStoreErrorLog()); CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());
@ -105,4 +105,4 @@ namespace Microsoft.AspNet.Diagnostics.Entity
} }
} }
} }
} }

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

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using JetBrains.Annotations; using JetBrains.Annotations;
@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
try try
{ {
#if !ASPNETCORE50 #if !DNXCORE50
// 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

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

@ -1,4 +1,4 @@
{ {
"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.",
"compilationOptions": { "compilationOptions": {
@ -10,12 +10,12 @@
}, },
"code": [ "**\\*.cs", "..\\Shared\\*.cs" ], "code": [ "**\\*.cs", "..\\Shared\\*.cs" ],
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Configuration": "" "System.Configuration": ""
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Threading": "4.0.10-beta-*" "System.Threading": "4.0.10-beta-*"
} }

6
src/Microsoft.AspNet.Diagnostics.Interfaces/project.json
View File

@ -3,11 +3,11 @@
"description": "ASP.NET 5 diagnostics middleware interfaces.", "description": "ASP.NET 5 diagnostics middleware interfaces.",
"compilationOptions": { "warningsAsErrors": true }, "compilationOptions": { "warningsAsErrors": true },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Runtime": "4.0.20-beta-*" "System.Runtime": "4.0.20-beta-*"
} }
} }
} }
} }

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

@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 Middleware for error handling, error pages, and diagnostics information.", "description": "ASP.NET 5 Middleware for error handling, error pages, and diagnostics information.",
"dependencies": { "dependencies": {
@ -8,11 +8,11 @@
"Microsoft.Framework.WebEncoders": "1.0.0-*" "Microsoft.Framework.WebEncoders": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Reflection.Extensions": "4.0.0-beta-*" "System.Reflection.Extensions": "4.0.0-beta-*"
} }
} }
} }
} }

6
src/PageGenerator/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*", "Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*",
@ -6,8 +6,8 @@
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Console": "4.0.0-beta-*" "System.Console": "4.0.0-beta-*"
} }

4
test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"EntityFramework.SqlServer": "7.0.0-*", "EntityFramework.SqlServer": "7.0.0-*",
"Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
@ -10,6 +10,6 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { } "dnx451": { }
} }
} }

4
test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"EntityFramework.InMemory": "7.0.0-*", "EntityFramework.InMemory": "7.0.0-*",
"Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
@ -10,6 +10,6 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { } "dnx451": { }
} }
} }

6
test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
View File

@ -10,7 +10,7 @@ using Microsoft.AspNet.Diagnostics.Elm;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
using Microsoft.Framework.OptionsModel; using Microsoft.Framework.OptionsModel;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
Assert.Equal(DefaultPath, options.Path.Value); Assert.Equal(DefaultPath, options.Path.Value);
} }
#if ASPNET50 #if DNX451
[Fact] [Fact]
public async void Invoke_WithNonMatchingPath_IgnoresRequest() public async void Invoke_WithNonMatchingPath_IgnoresRequest()
{ {
@ -215,4 +215,4 @@ namespace Microsoft.AspNet.Diagnostics.Tests
} }
#endif #endif
} }
} }

6
test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
View File

@ -12,7 +12,7 @@ using Microsoft.AspNet.Http;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
using Microsoft.Framework.WebEncoders; using Microsoft.Framework.WebEncoders;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
Assert.Equal(DefaultPath, options.Path.Value); Assert.Equal(DefaultPath, options.Path.Value);
} }
#if ASPNET50 #if DNX451
[Fact] [Fact]
public void CreateRuntimeInfoModel_GetsTheVersionAndAllPackages() public void CreateRuntimeInfoModel_GetsTheVersionAndAllPackages()
{ {
@ -240,4 +240,4 @@ namespace Microsoft.AspNet.Diagnostics.Tests
} }
} }
} }
} }

6
test/Microsoft.AspNet.Diagnostics.Tests/project.json
View File

@ -1,4 +1,4 @@
{ {
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
@ -8,12 +8,12 @@
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }
}, },
"aspnetcore50": { "dnxcore50": {
} }
}, },
"commands": { "commands": {