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

Merge branch 'release' into dev

This commit is contained in:
dougbu 2014-06-23 15:45:03 -07:00
parent 15b06a4057 0c6749a5e7
commit 2bfc3e32e9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MvcSample.Web/project.json
View File

@ -3,13 +3,13 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Helios": "1.0.0-*",
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc": "",
"Microsoft.AspNet.Mvc.Core": "", "Microsoft.AspNet.Mvc.Core": "",
"Microsoft.AspNet.Mvc.ModelBinding": "", "Microsoft.AspNet.Mvc.ModelBinding": "",
"Microsoft.AspNet.Mvc.Razor": "", "Microsoft.AspNet.Mvc.Razor": "",
"Microsoft.AspNet.Routing": "1.0.0-*", "Microsoft.AspNet.Routing": "1.0.0-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
"Microsoft.DataAnnotations": "1.0.0-*", "Microsoft.DataAnnotations": "1.0.0-*",
"Microsoft.Framework.ConfigurationModel": "1.0.0-*", "Microsoft.Framework.ConfigurationModel": "1.0.0-*",

4
test/WebSites/BasicWebSite/project.json
View File

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"Helios": "1.0.0-*", "Microsoft.AspNet.Mvc": "",
"Microsoft.AspNet.Mvc": "" "Microsoft.AspNet.Server.IIS": "1.0.0-*"
}, },
"configurations": { "configurations": {
"net45": { }, "net45": { },

2
test/WebSites/InlineConstraintsWebSite/project.json
View File

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"Helios": "1.0.0-*",
"Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc": "",
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*" "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*"
}, },
"configurations": { "configurations": {