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:39:17 -08:00
parent a8ba99bc5b
commit 76a4a75de5
7 changed files with 48 additions and 21 deletions

View File

@ -40,8 +40,11 @@
"System.Reflection": "" "System.Reflection": ""
} }
}, },
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net45+win8" "imports": [
"dnxcore50",
"portable-net45+win8"
]
} }
}, },
"exclude": [ "exclude": [
@ -56,5 +59,7 @@
"gulp min" "gulp min"
] ]
}, },
"content": ["appsettings.json"] "content": [
"appsettings.json"
]
} }

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": {
@ -22,11 +24,14 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.ComponentModel.TypeConverter": "4.0.1-*" "System.ComponentModel.TypeConverter": "4.0.1-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

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": {
@ -18,9 +20,12 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": {}, "dependencies": {},
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -15,12 +15,15 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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

@ -20,12 +20,15 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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

@ -16,12 +16,15 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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

@ -15,13 +15,16 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"System.Xml.ReaderWriter": "4.0.10-*", "System.Xml.ReaderWriter": "4.0.10-*",
"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": {