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

Merge branch 'release' into dev

This commit is contained in:
BrennanConroy 2016-04-14 15:41:55 -07:00
parent 5bca59a8bd 3db1f1e9fd
commit 580cf760a4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.Authentication.OAuth/project.json
View File

@ -20,12 +20,14 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Authentication": "1.0.0-*", "Microsoft.AspNetCore.Authentication": "1.0.0-*",
"Newtonsoft.Json": "8.0.3", "Newtonsoft.Json": "8.0.3"
"System.Runtime.Serialization.Primitives": "4.1.1-*"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": {
"System.Runtime.Serialization.Primitives": "4.1.1-*"
},
"imports": [ "imports": [
"portable-net451+win8" "portable-net451+win8"
] ]