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:29:45 -08:00
parent ed2529edce
commit e8f642df19
4 changed files with 28 additions and 11 deletions

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": {
@ -21,11 +23,14 @@
"System.Runtime": "" "System.Runtime": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-*",
"System.Resources.ResourceManager": "4.0.1-*" "System.Resources.ResourceManager": "4.0.1-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -9,7 +9,9 @@
"warningsAsErrors": true, "warningsAsErrors": true,
"allowUnsafe": true, "allowUnsafe": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -24,6 +26,10 @@
"System.Runtime": "" "System.Runtime": ""
} }
}, },
"dotnet5.4": {} "netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
} }
} }

View File

@ -12,11 +12,14 @@
}, },
"testRunner": "xunit", "testRunner": "xunit",
"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": {
"dependencies": { "dependencies": {

View File

@ -12,11 +12,14 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"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": {
"dependencies": { "dependencies": {