Transition to netstandard.

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.
This commit is contained in:
N. Taylor Mullen 2016-03-01 13:38:47 -08:00
parent 2ee543d8a2
commit 7c60ec6fa5
7 changed files with 40 additions and 14 deletions

View File

@ -14,7 +14,11 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
}, },
"exclude": [ "exclude": [
"wwwroot", "wwwroot",

View File

@ -14,7 +14,11 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
}, },
"publishExclude": [ "publishExclude": [
"node_modules", "node_modules",

View File

@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Buffering
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
} }
} }
#if !DOTNET5_4 #if !NETSTANDARD1_3
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)

View File

@ -3,7 +3,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET middleware for buffering response bodies.", "description": "ASP.NET middleware for buffering response bodies.",
@ -16,6 +18,10 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": {} "netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
} }
} }

View File

@ -3,7 +3,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"description": "XForward and Method override middlewares for ASP.NET", "description": "XForward and Method override middlewares for ASP.NET",
@ -18,6 +20,10 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": {} "netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
} }
} }

View File

@ -10,11 +10,14 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
}, },
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {

View File

@ -11,11 +11,14 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
}, },
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {