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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2015-06-02 16:25:59 -07:00
parent 79b190288e 0b214a0e77
commit 847894f317
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NuGet.Config
View File

@ -3,5 +3,6 @@
<packageSources> <packageSources>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" /> <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
<add key="NuGet" value="https://nuget.org/api/v2/" /> <add key="NuGet" value="https://nuget.org/api/v2/" />
<add key="AzureAD" value="http://www.myget.org/F/azureadwebstackrelease"/>
</packageSources> </packageSources>
</configuration> </configuration>

2
src/Microsoft.AspNet.Authentication.OAuthBearer/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.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta4-*" "Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta5-*"
}, },
"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.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta4-*" "Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta5-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { "dnx451": {