Merge branch 'release' into dev
This commit is contained in:
commit
ba5712c824
|
|
@ -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-*"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue