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

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:56:09 -07:00
parent 5e7f1d7eff
commit 1bd605da5e
28 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/CookieSample/project.json
View File

@ -1,4 +1,4 @@
{
{
"dependencies": {
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@ -10,9 +10,9 @@
"kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004"
},
"frameworks": {
"aspnet50": {
"dnx451": {
},
"aspnetcore50": {
"dnxcore50": {
}
},
"webroot":"wwwroot"

6
samples/CookieSessionSample/project.json
View File

@ -1,4 +1,4 @@
{
{
"dependencies": {
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@ -11,8 +11,8 @@
"kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
},
"webroot": "wwwroot"
}

4
samples/OpenIdConnectSample/project.json
View File

@ -7,8 +7,8 @@
"Microsoft.AspNet.Server.WebListener": "1.0.0-*"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
},
"commands": {
"web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345",

6
samples/SocialSample/project.json
View File

@ -1,4 +1,4 @@
{
{
"dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-*",
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
@ -16,9 +16,9 @@
"kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:54540"
},
"frameworks": {
"aspnet50": {
"dnx451": {
},
"aspnetcore50": {
"dnxcore50": {
}
},
"webroot": "wwwroot"

6
src/Microsoft.AspNet.Authentication.Cookies/project.json
View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET middleware that enables an application to use cookie based authentication, similar to ASP.NET's forms authentication.",
"dependencies": {
@ -6,7 +6,7 @@
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
}
}

6
src/Microsoft.AspNet.Authentication.Facebook/project.json
View File

@ -1,11 +1,11 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 middleware that enables an application to support Facebook's OAuth 2.0 authentication workflow.",
"dependencies": {
"Microsoft.AspNet.Authentication.OAuth": "1.0.0-*"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
}
}

6
src/Microsoft.AspNet.Authentication.Google/project.json
View File

@ -1,11 +1,11 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 contains middlewares to support Google's OpenId and OAuth 2.0 authentication workflows.",
"dependencies": {
"Microsoft.AspNet.Authentication.OAuth": "1.0.0-*"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
}
}

6
src/Microsoft.AspNet.Authentication.MicrosoftAccount/project.json
View File

@ -1,12 +1,12 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 middleware that enables an application to support the Microsoft Account authentication workflow.",
"dependencies": {
"Microsoft.AspNet.Authentication.OAuth": "1.0.0-*"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Dynamic.Runtime": "4.0.10-beta-*",
"System.ObjectModel": "4.0.10-beta-*"

2
src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationMiddleware.cs
View File

@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Authentication.OAuth
private static HttpMessageHandler ResolveHttpMessageHandler(OAuthAuthenticationOptions<TNotifications> options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if ASPNET50
#if DNX451
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

2
src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationOptions.cs
View File

@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Authentication.OAuth
/// </summary>
public string UserInformationEndpoint { get; set; }
#if ASPNET50
#if DNX451
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to the auth provider.

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

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 middleware that enables an application to support any standard OAuth 2.0 authentication workflow.",
"dependencies": {
@ -6,13 +6,13 @@
"Microsoft.AspNet.Authentication": "1.0.0-*"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"frameworkAssemblies": {
"System.Net.Http.WebRequest": "",
"System.Net.Http": ""
}
},
"aspnetcore50": {
"dnxcore50": {
"dependencies": {
"System.Net.Http.WinHttpHandler": "4.0.0-beta-*"
}

2
src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationMiddleware.cs
View File

@ -93,7 +93,7 @@ namespace Microsoft.AspNet.Authentication.OAuthBearer
private static HttpMessageHandler ResolveHttpMessageHandler(OAuthBearerAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if ASPNET50
#if DNX451
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

4
src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationOptions.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Authentication.OAuthBearer
/// </summary>
public TimeSpan BackchannelTimeout { get; set; }
#if ASPNET50
#if DNX451
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// when retrieving metadata.

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

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 middleware that enables an application to receive a OAuth bearer token.",
"dependencies": {
@ -7,13 +7,13 @@
"System.IdentityModel.Tokens": "5.0.0-beta1-*"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"frameworkAssemblies": {
"System.Net.Http.WebRequest": "",
"System.Net.Http": ""
}
},
"aspnetcore50": {
"dnxcore50": {
"dependencies": {
"System.Net.Http.WinHttpHandler": "4.0.0-beta-*"
}

2
src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs
View File

@ -139,7 +139,7 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect
private static HttpMessageHandler ResolveHttpMessageHandler(OpenIdConnectAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if ASPNET50
#if DNX451
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

2
src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationOptions.cs
View File

@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect
/// If the IdentityProvider does not post to this address, you may end up in a 401 -> IdentityProvider -> Client -> 401 -> ...</remarks>
public PathString CallbackPath { get; set; }
#if ASPNET50
#if DNX451
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// when retrieving metadata.

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

@ -1,21 +1,21 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNet.Authentication": "1.0.0-*",
"Microsoft.IdentityModel.Protocol.Extensions": "2.0.0-beta1-*"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"frameworkAssemblies": {
"System.Net.Http": "",
"System.Net.Http.WebRequest": ""
}
},
"aspnetcore50": {
"dnxcore50": {
"dependencies": {
"System.Collections.Specialized": "4.0.0-beta-*",
"System.Net.Http.WinHttpHandler": "4.0.0-beta-*"
}
}
}
}
}

4
src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationMiddleware.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Authentication.Twitter
private static HttpMessageHandler ResolveHttpMessageHandler(TwitterAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if ASPNET50
#if DNX451
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

6
src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationOptions.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Authentication.Twitter
Caption = AuthenticationScheme;
CallbackPath = new PathString("/signin-twitter");
BackchannelTimeout = TimeSpan.FromSeconds(60);
#if ASPNET50
#if DNX451
// Twitter lists its valid Subject Key Identifiers at https://dev.twitter.com/docs/security/using-ssl
BackchannelCertificateValidator = new CertificateSubjectKeyIdentifierValidator(
new[]
@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Authentication.Twitter
/// The back channel timeout.
/// </value>
public TimeSpan BackchannelTimeout { get; set; }
#if ASPNET50
#if DNX451
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Twitter.

6
src/Microsoft.AspNet.Authentication.Twitter/project.json
View File

@ -1,17 +1,17 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 middleware that enables an application to support Twitter's OAuth 2.0 authentication workflow.",
"dependencies": {
"Microsoft.AspNet.Authentication": "1.0.0-*"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"frameworkAssemblies": {
"System.Net.Http.WebRequest": "",
"System.Net.Http": ""
}
},
"aspnetcore50": {
"dnxcore50": {
"dependencies": {
"System.Net.Http.WinHttpHandler": "4.0.0-beta-*"
}

4
src/Microsoft.AspNet.Authentication/CertificateSubjectKeyIdentifierValidator.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if ASPNET50
#if DNX451
using System;
using System.Collections.Generic;
using System.Net.Security;

4
src/Microsoft.AspNet.Authentication/CertificateSubjectPublicKeyInfoValidator.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if ASPNET50
#if DNX451
using System;
using System.Collections.Generic;
using System.ComponentModel;

4
src/Microsoft.AspNet.Authentication/CertificateThumbprintValidator.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if ASPNET50
#if DNX451
using System;
using System.Collections.Generic;
using System.Net.Security;

4
src/Microsoft.AspNet.Authentication/ICertificateValidator.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if ASPNET50
#if DNX451
using System;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;

6
src/Microsoft.AspNet.Authentication/project.json
View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 common types used by the various authentication middleware.",
"dependencies": {
@ -9,7 +9,7 @@
"Microsoft.Framework.Logging": "1.0.0-*"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
}
}

6
src/Microsoft.AspNet.Authorization/project.json
View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 authorization classes.",
"dependencies": {
@ -7,7 +7,7 @@
"Microsoft.Framework.OptionsModel": "1.0.0-*"
},
"frameworks": {
"aspnet50": { },
"aspnetcore50": { }
"dnx451": { },
"dnxcore50": { }
}
}

4
test/Microsoft.AspNet.Authentication.Test/project.json
View File

@ -1,4 +1,4 @@
{
{
"compilationOptions": {
"warningsAsErrors": true
},
@ -18,7 +18,7 @@
"test": "xunit.runner.kre"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"dependencies": {
"Shouldly": "1.1.1.1"
}

4
test/Microsoft.AspNet.Authorization.Test/project.json
View File

@ -1,4 +1,4 @@
{
{
"compilationOptions": {
"warningsAsErrors": true
},
@ -12,7 +12,7 @@
"test": "xunit.runner.kre"
},
"frameworks": {
"aspnet50": {
"dnx451": {
"dependencies": {
"Shouldly": "1.1.1.1"
}