Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-14 16:10:07 -07:00
commit a82ce5ea77
1 changed files with 5 additions and 2 deletions

View File

@ -8,11 +8,14 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*",
"System.Threading.Thread": "4.0.0-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
},
"imports": [