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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2014-12-12 16:56:54 -08:00
parent 263e75c8a6 2df482aa5c
commit ba5712c824
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Mvc.ModelBinding/project.json
View File

@ -27,7 +27,7 @@
"System.Reflection.TypeExtensions": "4.0.0-beta-*", "System.Reflection.TypeExtensions": "4.0.0-beta-*",
"System.Runtime.Serialization.Primitives": "4.0.0-beta-*", "System.Runtime.Serialization.Primitives": "4.0.0-beta-*",
"System.Runtime.Serialization.Xml": "4.0.10-beta-*", "System.Runtime.Serialization.Xml": "4.0.10-beta-*",
"System.Xml.XmlSerializer": "4.0.0-beta-*" "System.Xml.XmlSerializer": "4.0.10-beta-*"
} }
} }
} }

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

@ -14,10 +14,6 @@
"frameworks": { "frameworks": {
"aspnet50": { }, "aspnet50": { },
"aspnetcore50": { "aspnetcore50": {
"dependencies": {
"System.Runtime.Serialization.Xml": "4.0.0-beta-*",
"System.Xml.ReaderWriter": "4.0.10-beta-*"
}
} }
}, },
"webroot": "wwwroot" "webroot": "wwwroot"