From 418f7452925d4d502efdd20334dcd2870a2368e0 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Thu, 4 Sep 2014 01:52:19 -0700 Subject: [PATCH] Updated to use the new target framework in project.json --- samples/SampleApp/project.json | 2 +- src/Kestrel/project.json | 2 +- .../Http/FrameDuplexStream.cs | 10 +++++----- .../Http/FrameRequestStream.cs | 4 ++-- .../Infrastructure/KestrelThread.cs | 4 ++-- src/Microsoft.AspNet.Server.Kestrel/project.json | 2 +- test/Microsoft.AspNet.Server.KestrelTests/project.json | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json index f116683326..53324e948f 100644 --- a/samples/SampleApp/project.json +++ b/samples/SampleApp/project.json @@ -6,7 +6,7 @@ "Microsoft.AspNet.WebSockets.Server": "1.0.0-*" }, "frameworks": { - "net45": { }, + "aspnet50": { }, "aspnetcore50": { "dependencies": { "System.Console": "4.0.0.0" diff --git a/src/Kestrel/project.json b/src/Kestrel/project.json index ea2f0f22df..02b470341b 100644 --- a/src/Kestrel/project.json +++ b/src/Kestrel/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "frameworks": { - "net45": { + "aspnet50": { "dependencies": { } }, "aspnetcore50": { diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs index 6d4276f8eb..27db2d30b0 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.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; @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http _responseStream = responseStream; } -#if NET45 +#if ASPNET50 public override void Close() { _requestStream.Close(); @@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http return _responseStream.FlushAsync(cancellationToken); } -#if NET45 +#if ASPNET50 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 NET45 +#if ASPNET50 public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { return _responseStream.BeginWrite(buffer, offset, count, callback, state); @@ -191,4 +191,4 @@ namespace Microsoft.AspNet.Server.Kestrel.Http } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs index b7a219b8d9..aed7e30cf3 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.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; @@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http return ReadAsync(buffer, offset, count).Result; } -#if NET45 +#if ASPNET50 public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) { var task = ReadAsync(buffer, offset, count, CancellationToken.None, state); diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs index 5ef6f101a7..b7fd07c627 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs +++ b/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.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 Microsoft.AspNet.Server.Kestrel.Networking; @@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Server.Kestrel Post(OnStopImmediate, null); if (!_thread.Join((int)timeout.TotalMilliseconds)) { -#if NET45 +#if ASPNET50 _thread.Abort(); #endif } diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json index 44c423ad5b..84771e2c53 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/project.json +++ b/src/Microsoft.AspNet.Server.Kestrel/project.json @@ -4,7 +4,7 @@ "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" }, "frameworks": { - "net45": { + "aspnet50": { "compilationOptions": { "define": [ "TRACE", "NET45" ], "allowUnsafe": true diff --git a/test/Microsoft.AspNet.Server.KestrelTests/project.json b/test/Microsoft.AspNet.Server.KestrelTests/project.json index 81324784a0..99c5d008c7 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/project.json +++ b/test/Microsoft.AspNet.Server.KestrelTests/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "frameworks": { - "net45": { + "aspnet50": { "compilationOptions": { "define": [ "TRACE" ] } }, "aspnetcore50": {