Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-27 11:05:27 -07:00
commit 521fd593f0
1 changed files with 5 additions and 4 deletions

View File

@ -23,14 +23,15 @@
"portable-net45+win8" "portable-net45+win8"
], ],
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": "1.0.0-*",
"version": "1.0.0-*",
"type": "platform"
},
"System.Net.Primitives": "4.0.11-*", "System.Net.Primitives": "4.0.11-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
} }
}, },
"net451": { } "net451": { }
},
"runtimes": {
"win7-x86": { },
"win7-x64": { }
} }
} }