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:37:03 -08:00
parent ca83e8af78
commit bb7cb4a0d9
8 changed files with 51 additions and 27 deletions

View File

@ -12,9 +12,12 @@
"web": "RoutingSample.Web" "web": "RoutingSample.Web"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -19,13 +21,16 @@
} }
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Collections.Concurrent": "4.0.12-*", "System.Collections.Concurrent": "4.0.12-*",
"System.Threading.Tasks": "4.0.11-*", "System.Threading.Tasks": "4.0.11-*",
"System.Reflection.Extensions": "4.0.1-*" "System.Reflection.Extensions": "4.0.1-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -11,10 +11,12 @@
}, },
"shared": "**/*.cs", "shared": "**/*.cs",
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {},
} "imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Routing.Internal
{ {
public static class TaskCache public static class TaskCache
{ {
#if DOTNET5_4 #if NETSTANDARD1_3
public static readonly Task CompletedTask = Task.CompletedTask; public static readonly Task CompletedTask = Task.CompletedTask;
#else #else
public static readonly Task CompletedTask = Task.FromResult(0); public static readonly Task CompletedTask = Task.FromResult(0);

View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -31,12 +33,15 @@
} }
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-*",
"System.Text.RegularExpressions": "4.0.12-*", "System.Text.RegularExpressions": "4.0.12-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -9,12 +9,15 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"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

@ -13,11 +13,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

@ -14,12 +14,15 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"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": {