Update aspnet50/aspnetcore50 => dnx451/dnxcore50.
This commit is contained in:
N. Taylor Mullen
parent
620e83b590
commit
06a82669f5
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"dependencies": {
|
||||
"Kestrel": "1.0.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"aspnet50": { },
|
||||
"aspnetcore50": {
|
||||
"dnx451": { },
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"System.Console": "4.0.0-beta-*"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"description": "ASP.NET 5 cross platform development web server.",
|
||||
"dependencies": {
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"aspnet50": {
|
||||
"dnx451": {
|
||||
"dependencies": { }
|
||||
},
|
||||
"aspnetcore50": {
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"System.Runtime": "4.0.20-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.
|
||||
|
||||
using System;
|
||||
|
|
@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
|
|||
_responseStream = responseStream;
|
||||
}
|
||||
|
||||
#if ASPNET50
|
||||
#if DNX451
|
||||
public override void Close()
|
||||
{
|
||||
_requestStream.Close();
|
||||
|
|
@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
|
|||
return _responseStream.FlushAsync(cancellationToken);
|
||||
}
|
||||
|
||||
#if ASPNET50
|
||||
#if DNX451
|
||||
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
||||
{
|
||||
return _requestStream.BeginRead(buffer, offset, count, callback, state);
|
||||
|
|
@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
|
|||
return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken);
|
||||
}
|
||||
|
||||
#if ASPNET50
|
||||
#if DNX451
|
||||
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
||||
{
|
||||
return _responseStream.BeginWrite(buffer, offset, count, callback, state);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
|
|||
return ReadAsync(buffer, offset, count).Result;
|
||||
}
|
||||
|
||||
#if ASPNET50
|
||||
#if DNX451
|
||||
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
||||
{
|
||||
var task = ReadAsync(buffer, offset, count, CancellationToken.None, state);
|
||||
|
|
|
|||
|
|
@ -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 Microsoft.AspNet.Server.Kestrel.Networking;
|
||||
|
|
@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Server.Kestrel
|
|||
Post(OnStopImmediate, null);
|
||||
if (!_thread.Join((int)timeout.TotalMilliseconds))
|
||||
{
|
||||
#if ASPNET50
|
||||
#if DNX451
|
||||
_thread.Abort();
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
|
|||
{
|
||||
public static bool IsWindows()
|
||||
{
|
||||
#if ASPNETCORE50
|
||||
#if DNXCORE50
|
||||
return true;
|
||||
#else
|
||||
var p = (int)Environment.OSVersion.Platform;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"description": "ASP.NET 5 cross platform development web server.",
|
||||
"dependencies": {
|
||||
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"aspnet50": { },
|
||||
"aspnetcore50": {
|
||||
"dnx451": { },
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"System.Collections": "4.0.10-beta-*",
|
||||
"System.Diagnostics.Debug": "4.0.10-beta-*",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"dependencies": {
|
||||
"xunit.runner.kre": "1.0.0-*",
|
||||
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
|
||||
},
|
||||
"frameworks": {
|
||||
"aspnet50": { },
|
||||
"aspnetcore50": {
|
||||
"dnx451": { },
|
||||
"dnxcore50": {
|
||||
"dependencies": {
|
||||
"System.Net.Sockets": "4.0.0-beta-*",
|
||||
"System.Runtime.Handles": "4.0.0-beta-*",
|
||||
|
|
|
|||
Loading…
Reference in New Issue