Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:50:29 -07:00
parent ee55e38260
commit 19df67f33e
8 changed files with 25 additions and 25 deletions

View File

@ -7,7 +7,7 @@
"Microsoft.Framework.ConfigurationModel": "1.0.0-*"
},
"frameworks": {
"aspnet50": {},
"aspnetcore50": {}
"dnx451": {},
"dnxcore50": {}
}
}
}

View File

@ -1,11 +1,11 @@
// 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.
using System;
#if ASPNET50
#if DNX451
using System.Runtime.Remoting.Messaging;
using System.Runtime.Remoting;
#elif ASPNETCORE50
#elif DNXCORE50
using System.Threading;
#endif
using Microsoft.AspNet.Http;
@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Hosting
{
public class HttpContextAccessor : IHttpContextAccessor
{
#if ASPNET50
#if DNX451
private const string LogicalDataKey = "__HttpContext_Current__";
public HttpContext HttpContext
@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Hosting
}
}
#elif ASPNETCORE50
#elif DNXCORE50
private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
public HttpContext HttpContext
{

View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
"dependencies": {
@ -11,8 +11,8 @@
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Console": "4.0.0-beta-*"
}

View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 enables per-request scoping of services.",
"dependencies": {
@ -7,8 +7,8 @@
"Microsoft.Framework.OptionsModel": "1.0.0-*"
},
"frameworks": {
"aspnet50": {},
"aspnetcore50": {
"dnx451": {},
"dnxcore50": {
"dependencies": {
"System.Threading": "4.0.10-beta-*"
}

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.
using System;
@ -161,7 +161,7 @@ namespace Microsoft.AspNet.TestHost
_readLock.Release();
}
}
#if ASPNET50
#if DNX451
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
// TODO: This option doesn't preserve the state object.
@ -258,7 +258,7 @@ namespace Microsoft.AspNet.TestHost
_writeLock.Release();
}
}
#if ASPNET50
#if DNX451
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
Write(buffer, offset, count);

View File

@ -1,16 +1,16 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 web server for writing and running tests.",
"dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"frameworkAssemblies": {
"System.Net.Http": ""
}
},
"aspnetcore50": {
"dnxcore50": {
"dependencies": {
"System.Diagnostics.Contracts": "4.0.0-beta-*",
"System.Net.Http": "4.0.0-beta-*"

View File

@ -1,4 +1,4 @@
{
{
"dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*",
"Microsoft.AspNet.Owin": "1.0.0-*",
@ -6,10 +6,10 @@
"xunit.runner.kre": "1.0.0-*"
},
"frameworks": {
"aspnet50": {}
"dnx451": {}
},
"commands": {
"test": "xunit.runner.kre"
},
"webroot": "testroot"
}
}

View File

@ -1,4 +1,4 @@
{
{
"dependencies": {
"Microsoft.AspNet.TestHost": "1.0.0-*",
"xunit.runner.kre": "1.0.0-*"
@ -7,6 +7,6 @@
"test": "xunit.runner.kre"
},
"frameworks": {
"aspnet50": { }
"dnx451": { }
}
}