Merge remote-tracking branch 'origin/release' into dev

This commit is contained in:
Pranav K 2014-10-22 15:26:35 -07:00
commit 1bbdc7c1c9
1 changed files with 2 additions and 2 deletions

View File

@ -4,10 +4,10 @@
"warningsAsErrors": false "warningsAsErrors": false
}, },
"dependencies": { "dependencies": {
"K.Roslyn": "1.0.0-*",
"Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" }, "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
"Microsoft.AspNet.Mvc.Core": "6.0.0-*", "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*" "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
"Microsoft.CodeAnalysis.CSharp" : "0.7.4101902-beta"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "aspnet50": {