Merge branch 'release' into dev

This commit is contained in:
Pranav K 2014-12-12 16:56:54 -08:00
commit ba5712c824
2 changed files with 1 additions and 5 deletions

View File

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

View File

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