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

Switching to generations TFMs

This commit is contained in:
Pranav K 2015-10-22 01:11:23 -07:00
parent c765fedb21
commit da00b1298c
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Buffering/BufferingWriteStream.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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;
@ -159,7 +159,7 @@ namespace Microsoft.AspNet.Buffering
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
} }
} }
#if !DNXCORE50 #if !DOTNET5_4
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)
{ {
if (_isBuffering) if (_isBuffering)

11
src/Microsoft.AspNet.Buffering/project.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET middleware for buffering response bodies.", "description": "ASP.NET middleware for buffering response bodies.",
"repository": { "repository": {
@ -9,10 +9,9 @@
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*" "Microsoft.AspNet.Http.Abstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {}
}
} }
} }
} }

6
src/Microsoft.AspNet.HttpOverrides/project.json
View File

@ -9,8 +9,8 @@
"Microsoft.AspNet.Http.Extensions": "1.0.0-*" "Microsoft.AspNet.Http.Extensions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.10-*", "System.Collections": "4.0.10-*",
"System.Linq": "4.0.0-*", "System.Linq": "4.0.0-*",
@ -18,4 +18,4 @@
} }
} }
} }
} }