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:36:35 -08:00
parent db2093ec2a
commit f9b9dcd79b
4 changed files with 27 additions and 17 deletions

View File

@ -1,6 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Antiforgery": "1.0.0-*", "Microsoft.AspNetCore.Antiforgery": "1.0.0-*",
"Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
@ -11,22 +10,21 @@
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Newtonsoft.Json": "8.0.2" "Newtonsoft.Json": "8.0.2"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"commands": { "commands": {
"web": "AntiforgerySample" "web": "AntiforgerySample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
}, },
"publishExclude": [ "publishExclude": [
"node_modules", "node_modules",
"bower_components", "bower_components",
@ -39,4 +37,4 @@
"node_modules", "node_modules",
"bower_components" "bower_components"
] ]
} }

View File

@ -4,7 +4,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"repository": { "repository": {
@ -17,7 +19,11 @@
"Microsoft.Extensions.ObjectPool": "1.0.0-*" "Microsoft.Extensions.ObjectPool": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dotnet5.4": { }, "netstandard1.3": {
"net451": { } "imports": [
"dotnet5.4"
]
},
"net451": {}
} }
} }

View File

@ -7,13 +7,16 @@
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"System.Net.Http": "4.0.1-*", "System.Net.Http": "4.0.1-*",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
}, },
"dnx451": { "dnx451": {
"dependencies": { "dependencies": {

View File

@ -15,12 +15,15 @@
}, },
"testRunner": "xunit", "testRunner": "xunit",
"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"
]
}, },
"dnx451": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
@ -32,4 +35,4 @@
} }
} }
} }
} }