huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
anurse 2015-06-13 00:16:47 -07:00
parent 5e1fb16071 d436955e02
commit d8310239b1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/Microsoft.Framework.Localization.Test/project.json
View File

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