diff --git a/src/Microsoft.AspNet.Hosting.Interfaces/project.json b/src/Microsoft.AspNet.Hosting.Interfaces/project.json index 6f33dd5cea..bb1e04e39b 100644 --- a/src/Microsoft.AspNet.Hosting.Interfaces/project.json +++ b/src/Microsoft.AspNet.Hosting.Interfaces/project.json @@ -7,7 +7,7 @@ "Microsoft.Framework.ConfigurationModel": "1.0.0-*" }, "frameworks": { - "aspnet50": {}, - "aspnetcore50": {} + "dnx451": {}, + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs b/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs index 59b5cbd8fa..5b1e0ef9e1 100644 --- a/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs +++ b/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs @@ -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 _httpContextCurrent = new AsyncLocal(); public HttpContext HttpContext { diff --git a/src/Microsoft.AspNet.Hosting/project.json b/src/Microsoft.AspNet.Hosting/project.json index f4deb14aca..03a441eba0 100644 --- a/src/Microsoft.AspNet.Hosting/project.json +++ b/src/Microsoft.AspNet.Hosting/project.json @@ -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-*" } diff --git a/src/Microsoft.AspNet.RequestContainer/project.json b/src/Microsoft.AspNet.RequestContainer/project.json index 076064ad98..b2729bd744 100644 --- a/src/Microsoft.AspNet.RequestContainer/project.json +++ b/src/Microsoft.AspNet.RequestContainer/project.json @@ -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-*" } diff --git a/src/Microsoft.AspNet.TestHost/ResponseStream.cs b/src/Microsoft.AspNet.TestHost/ResponseStream.cs index 64e64c0c64..a3b555bd70 100644 --- a/src/Microsoft.AspNet.TestHost/ResponseStream.cs +++ b/src/Microsoft.AspNet.TestHost/ResponseStream.cs @@ -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); diff --git a/src/Microsoft.AspNet.TestHost/project.json b/src/Microsoft.AspNet.TestHost/project.json index c63c7dba59..c6360f74da 100644 --- a/src/Microsoft.AspNet.TestHost/project.json +++ b/src/Microsoft.AspNet.TestHost/project.json @@ -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-*" diff --git a/test/Microsoft.AspNet.Hosting.Tests/project.json b/test/Microsoft.AspNet.Hosting.Tests/project.json index 49c5506d3a..22e492d189 100644 --- a/test/Microsoft.AspNet.Hosting.Tests/project.json +++ b/test/Microsoft.AspNet.Hosting.Tests/project.json @@ -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" -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.TestHost.Tests/project.json b/test/Microsoft.AspNet.TestHost.Tests/project.json index cf98630c3f..df5be3e395 100644 --- a/test/Microsoft.AspNet.TestHost.Tests/project.json +++ b/test/Microsoft.AspNet.TestHost.Tests/project.json @@ -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": { } } }