Update aspnet50/aspnetcore50 => dnx451/dnxcore50.
This commit is contained in:
parent
ee55e38260
commit
19df67f33e
|
|
@ -7,7 +7,7 @@
|
||||||
"Microsoft.Framework.ConfigurationModel": "1.0.0-*"
|
"Microsoft.Framework.ConfigurationModel": "1.0.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"aspnet50": {},
|
"dnx451": {},
|
||||||
"aspnetcore50": {}
|
"dnxcore50": {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
#if ASPNET50
|
#if DNX451
|
||||||
using System.Runtime.Remoting.Messaging;
|
using System.Runtime.Remoting.Messaging;
|
||||||
using System.Runtime.Remoting;
|
using System.Runtime.Remoting;
|
||||||
#elif ASPNETCORE50
|
#elif DNXCORE50
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
#endif
|
#endif
|
||||||
using Microsoft.AspNet.Http;
|
using Microsoft.AspNet.Http;
|
||||||
|
|
@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Hosting
|
||||||
{
|
{
|
||||||
public class HttpContextAccessor : IHttpContextAccessor
|
public class HttpContextAccessor : IHttpContextAccessor
|
||||||
{
|
{
|
||||||
#if ASPNET50
|
#if DNX451
|
||||||
private const string LogicalDataKey = "__HttpContext_Current__";
|
private const string LogicalDataKey = "__HttpContext_Current__";
|
||||||
|
|
||||||
public HttpContext HttpContext
|
public HttpContext HttpContext
|
||||||
|
|
@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Hosting
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif ASPNETCORE50
|
#elif DNXCORE50
|
||||||
private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
|
private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
|
||||||
public HttpContext HttpContext
|
public HttpContext HttpContext
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
|
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -11,8 +11,8 @@
|
||||||
"Newtonsoft.Json": "6.0.6"
|
"Newtonsoft.Json": "6.0.6"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"aspnet50": { },
|
"dnx451": { },
|
||||||
"aspnetcore50": {
|
"dnxcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Console": "4.0.0-beta-*"
|
"System.Console": "4.0.0-beta-*"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"description": "ASP.NET 5 enables per-request scoping of services.",
|
"description": "ASP.NET 5 enables per-request scoping of services.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -7,8 +7,8 @@
|
||||||
"Microsoft.Framework.OptionsModel": "1.0.0-*"
|
"Microsoft.Framework.OptionsModel": "1.0.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"aspnet50": {},
|
"dnx451": {},
|
||||||
"aspnetcore50": {
|
"dnxcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Threading": "4.0.10-beta-*"
|
"System.Threading": "4.0.10-beta-*"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 System;
|
using System;
|
||||||
|
|
@ -161,7 +161,7 @@ namespace Microsoft.AspNet.TestHost
|
||||||
_readLock.Release();
|
_readLock.Release();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if ASPNET50
|
#if DNX451
|
||||||
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
||||||
{
|
{
|
||||||
// TODO: This option doesn't preserve the state object.
|
// TODO: This option doesn't preserve the state object.
|
||||||
|
|
@ -258,7 +258,7 @@ namespace Microsoft.AspNet.TestHost
|
||||||
_writeLock.Release();
|
_writeLock.Release();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if ASPNET50
|
#if DNX451
|
||||||
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
||||||
{
|
{
|
||||||
Write(buffer, offset, count);
|
Write(buffer, offset, count);
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"description": "ASP.NET 5 web server for writing and running tests.",
|
"description": "ASP.NET 5 web server for writing and running tests.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.AspNet.Hosting": "1.0.0-*"
|
"Microsoft.AspNet.Hosting": "1.0.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"aspnet50": {
|
"dnx451": {
|
||||||
"frameworkAssemblies": {
|
"frameworkAssemblies": {
|
||||||
"System.Net.Http": ""
|
"System.Net.Http": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"aspnetcore50": {
|
"dnxcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Diagnostics.Contracts": "4.0.0-beta-*",
|
"System.Diagnostics.Contracts": "4.0.0-beta-*",
|
||||||
"System.Net.Http": "4.0.0-beta-*"
|
"System.Net.Http": "4.0.0-beta-*"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.AspNet.Hosting": "1.0.0-*",
|
"Microsoft.AspNet.Hosting": "1.0.0-*",
|
||||||
"Microsoft.AspNet.Owin": "1.0.0-*",
|
"Microsoft.AspNet.Owin": "1.0.0-*",
|
||||||
|
|
@ -6,10 +6,10 @@
|
||||||
"xunit.runner.kre": "1.0.0-*"
|
"xunit.runner.kre": "1.0.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"aspnet50": {}
|
"dnx451": {}
|
||||||
},
|
},
|
||||||
"commands": {
|
"commands": {
|
||||||
"test": "xunit.runner.kre"
|
"test": "xunit.runner.kre"
|
||||||
},
|
},
|
||||||
"webroot": "testroot"
|
"webroot": "testroot"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.AspNet.TestHost": "1.0.0-*",
|
"Microsoft.AspNet.TestHost": "1.0.0-*",
|
||||||
"xunit.runner.kre": "1.0.0-*"
|
"xunit.runner.kre": "1.0.0-*"
|
||||||
|
|
@ -7,6 +7,6 @@
|
||||||
"test": "xunit.runner.kre"
|
"test": "xunit.runner.kre"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"aspnet50": { }
|
"dnx451": { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue