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:51:12 -07:00
parent 620e83b590
commit 06a82669f5
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/SampleApp/project.json
View File

@ -1,11 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Kestrel": "1.0.0-*" "Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Console": "4.0.0-beta-*" "System.Console": "4.0.0-beta-*"
} }

6
src/Kestrel/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 cross platform development web server.", "description": "ASP.NET 5 cross platform development web server.",
"dependencies": { "dependencies": {
@ -6,10 +6,10 @@
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { } "dependencies": { }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Runtime": "4.0.20-beta-*" "System.Runtime": "4.0.20-beta-*"
} }

8
src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.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 System; using System;
@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
_responseStream = responseStream; _responseStream = responseStream;
} }
#if ASPNET50 #if DNX451
public override void Close() public override void Close()
{ {
_requestStream.Close(); _requestStream.Close();
@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
return _responseStream.FlushAsync(cancellationToken); return _responseStream.FlushAsync(cancellationToken);
} }
#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)
{ {
return _requestStream.BeginRead(buffer, offset, count, callback, 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); return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken);
} }
#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)
{ {
return _responseStream.BeginWrite(buffer, offset, count, callback, state); return _responseStream.BeginWrite(buffer, offset, count, callback, state);

4
src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.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 System; using System;
@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
return ReadAsync(buffer, offset, count).Result; return ReadAsync(buffer, offset, count).Result;
} }
#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)
{ {
var task = ReadAsync(buffer, offset, count, CancellationToken.None, state); var task = ReadAsync(buffer, offset, count, CancellationToken.None, state);

4
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.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 Microsoft.AspNet.Server.Kestrel.Networking; using Microsoft.AspNet.Server.Kestrel.Networking;
@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Server.Kestrel
Post(OnStopImmediate, null); Post(OnStopImmediate, null);
if (!_thread.Join((int)timeout.TotalMilliseconds)) if (!_thread.Join((int)timeout.TotalMilliseconds))
{ {
#if ASPNET50 #if DNX451
_thread.Abort(); _thread.Abort();
#endif #endif
} }

4
src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.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 System; using System;
@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
{ {
public static bool IsWindows() public static bool IsWindows()
{ {
#if ASPNETCORE50 #if DNXCORE50
return true; return true;
#else #else
var p = (int)Environment.OSVersion.Platform; var p = (int)Environment.OSVersion.Platform;

6
src/Microsoft.AspNet.Server.Kestrel/project.json
View File

@ -1,12 +1,12 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 cross platform development web server.", "description": "ASP.NET 5 cross platform development web server.",
"dependencies": { "dependencies": {
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-beta-*", "System.Collections": "4.0.10-beta-*",
"System.Diagnostics.Debug": "4.0.10-beta-*", "System.Diagnostics.Debug": "4.0.10-beta-*",

6
test/Microsoft.AspNet.Server.KestrelTests/project.json
View File

@ -1,12 +1,12 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"xunit.runner.kre": "1.0.0-*", "xunit.runner.kre": "1.0.0-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Net.Sockets": "4.0.0-beta-*", "System.Net.Sockets": "4.0.0-beta-*",
"System.Runtime.Handles": "4.0.0-beta-*", "System.Runtime.Handles": "4.0.0-beta-*",