huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to use the new target framework in project.json

This commit is contained in:
David Fowler 2014-09-04 01:52:19 -07:00
parent 77d6318cfc
commit 418f745292
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/SampleApp/project.json
View File

@ -6,7 +6,7 @@
"Microsoft.AspNet.WebSockets.Server": "1.0.0-*" "Microsoft.AspNet.WebSockets.Server": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net45": { }, "aspnet50": { },
"aspnetcore50": { "aspnetcore50": {
"dependencies": { "dependencies": {
"System.Console": "4.0.0.0" "System.Console": "4.0.0.0"

2
src/Kestrel/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net45": { "aspnet50": {
"dependencies": { } "dependencies": { }
}, },
"aspnetcore50": { "aspnetcore50": {

10
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 NET45 #if ASPNET50
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 NET45 #if ASPNET50
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 NET45 #if ASPNET50
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);
@ -191,4 +191,4 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
} }
} }
} }
} }

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 NET45 #if ASPNET50
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 NET45 #if ASPNET50
_thread.Abort(); _thread.Abort();
#endif #endif
} }

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

@ -4,7 +4,7 @@
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net45": { "aspnet50": {
"compilationOptions": { "compilationOptions": {
"define": [ "TRACE", "NET45" ], "define": [ "TRACE", "NET45" ],
"allowUnsafe": true "allowUnsafe": true

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

@ -5,7 +5,7 @@
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net45": { "aspnet50": {
"compilationOptions": { "define": [ "TRACE" ] } "compilationOptions": { "define": [ "TRACE" ] }
}, },
"aspnetcore50": { "aspnetcore50": {