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

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

This commit is contained in:
Pranav K 2015-07-16 08:26:01 -07:00
parent bbd57217f2 430c903f65
commit 4103d947f4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.DataProtection/project.json
View File

@ -17,6 +17,7 @@
"frameworks": { "frameworks": {
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.IO": "",
"System.Security": "", "System.Security": "",
"System.Xml": "", "System.Xml": "",
"System.Xml.Linq": "" "System.Xml.Linq": ""
@ -24,6 +25,7 @@
}, },
"dnx451": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.IO": "",
"System.Security": "", "System.Security": "",
"System.Xml": "", "System.Xml": "",
"System.Xml.Linq": "" "System.Xml.Linq": ""