Merge branch 'release' into dev

This commit is contained in:
anurse 2015-06-13 00:16:47 -07:00
commit d8310239b1
1 changed files with 8 additions and 6 deletions

View File

@ -1,17 +1,19 @@
{
"dependencies": {
"xunit": "2.1.0-*",
"xunit.runner.dnx": "2.1.0-*",
"Microsoft.Framework.Localization": "1.0.0-*",
"System.Reflection": "4.0.10-beta-*"
"xunit.runner.aspnet": "2.0.0-aspnet-*",
"Microsoft.Framework.Localization": "1.0.0-*"
},
"commands": {
"test": "xunit.runner.dnx"
"test": "xunit.runner.aspnet"
},
"frameworks": {
"dnx451": { },
"dnxcore50": { }
"dnxcore50": {
"dependencies": {
"System.Reflection": "4.0.10-beta-*"
}
}
}
}