Merge branch 'release' into dev
This commit is contained in:
commit
a82ce5ea77
|
|
@ -8,11 +8,14 @@
|
||||||
},
|
},
|
||||||
"testRunner": "xunit",
|
"testRunner": "xunit",
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netstandardapp1.5": {
|
"netcoreapp1.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.App": {
|
||||||
|
"version": "1.0.0-*",
|
||||||
|
"type": "platform"
|
||||||
|
},
|
||||||
"dotnet-test-xunit": "1.0.0-dev-*",
|
"dotnet-test-xunit": "1.0.0-dev-*",
|
||||||
"System.Threading.Thread": "4.0.0-*",
|
"System.Threading.Thread": "4.0.0-*",
|
||||||
"NETStandard.Library": "1.5.0-*",
|
|
||||||
"System.Diagnostics.Process": "4.1.0-*"
|
"System.Diagnostics.Process": "4.1.0-*"
|
||||||
},
|
},
|
||||||
"imports": [
|
"imports": [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue