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

Merge branch 'release' into dev

This commit is contained in:
Praburaj 2015-03-31 11:10:23 -07:00
parent 0037618b56 1a37bf1747
commit fcf083dd76
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNet.Authentication.OAuthBearer/project.json
View File

@ -4,8 +4,7 @@
"dependencies": { "dependencies": {
"Microsoft.AspNet.Authentication": "1.0.0-*", "Microsoft.AspNet.Authentication": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" },
"Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta1-*", "Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta4-*"
"System.IdentityModel.Tokens": "5.0.0-beta1-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { "dnx451": {

2
src/Microsoft.AspNet.Authentication.OpenIdConnect/project.json
View File

@ -4,7 +4,7 @@
"dependencies": { "dependencies": {
"Microsoft.AspNet.Authentication": "1.0.0-*", "Microsoft.AspNet.Authentication": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" },
"Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta1-*" "Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta4-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { "dnx451": {