Updated to use the new target framework in project.json
This commit is contained in:
parent
565fde5187
commit
810c96e939
|
|
@ -13,7 +13,7 @@
|
||||||
},
|
},
|
||||||
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
|
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
},
|
},
|
||||||
"aspnetcore50": {
|
"aspnetcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
},
|
},
|
||||||
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
|
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
},
|
},
|
||||||
"aspnetcore50": {
|
"aspnetcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
"Newtonsoft.Json": "5.0.8"
|
"Newtonsoft.Json": "5.0.8"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {},
|
"aspnet50": {},
|
||||||
"aspnetcore50": {
|
"aspnetcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Collections": "4.0.10.0",
|
"System.Collections": "4.0.10.0",
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Security.Facebook
|
||||||
private static HttpMessageHandler ResolveHttpMessageHandler(FacebookAuthenticationOptions options)
|
private static HttpMessageHandler ResolveHttpMessageHandler(FacebookAuthenticationOptions options)
|
||||||
{
|
{
|
||||||
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
new WebRequestHandler();
|
new WebRequestHandler();
|
||||||
// If they provided a validator, apply it or fail.
|
// If they provided a validator, apply it or fail.
|
||||||
if (options.BackchannelCertificateValidator != null)
|
if (options.BackchannelCertificateValidator != null)
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Security.Facebook
|
||||||
/// Gets or sets the Facebook-assigned app secret.
|
/// Gets or sets the Facebook-assigned app secret.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string AppSecret { get; set; }
|
public string AppSecret { get; set; }
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
||||||
/// in back channel communications belong to Facebook.
|
/// in back channel communications belong to Facebook.
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"System.Net.Http": "4.0.0.0"
|
"System.Net.Http": "4.0.0.0"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Net.Http.WebRequest": ""
|
"System.Net.Http.WebRequest": ""
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Security.Google
|
||||||
private static HttpMessageHandler ResolveHttpMessageHandler(GoogleAuthenticationOptions options)
|
private static HttpMessageHandler ResolveHttpMessageHandler(GoogleAuthenticationOptions options)
|
||||||
{
|
{
|
||||||
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
new WebRequestHandler();
|
new WebRequestHandler();
|
||||||
// If they provided a validator, apply it or fail.
|
// If they provided a validator, apply it or fail.
|
||||||
if (options.BackchannelCertificateValidator != null)
|
if (options.BackchannelCertificateValidator != null)
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Security.Google
|
||||||
/// Gets or sets the Google-assigned client secret.
|
/// Gets or sets the Google-assigned client secret.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string ClientSecret { get; set; }
|
public string ClientSecret { get; set; }
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
||||||
/// in back channel communications belong to Google.
|
/// in back channel communications belong to Google.
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"System.Net.Http": "4.0.0.0"
|
"System.Net.Http": "4.0.0.0"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Net.Http.WebRequest": ""
|
"System.Net.Http.WebRequest": ""
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Security.MicrosoftAccount
|
||||||
private static HttpMessageHandler ResolveHttpMessageHandler(MicrosoftAccountAuthenticationOptions options)
|
private static HttpMessageHandler ResolveHttpMessageHandler(MicrosoftAccountAuthenticationOptions options)
|
||||||
{
|
{
|
||||||
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
new WebRequestHandler();
|
new WebRequestHandler();
|
||||||
// If they provided a validator, apply it or fail.
|
// If they provided a validator, apply it or fail.
|
||||||
if (options.BackchannelCertificateValidator != null)
|
if (options.BackchannelCertificateValidator != null)
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Security.MicrosoftAccount
|
||||||
Scope = new List<string>();
|
Scope = new List<string>();
|
||||||
BackchannelTimeout = TimeSpan.FromSeconds(60);
|
BackchannelTimeout = TimeSpan.FromSeconds(60);
|
||||||
}
|
}
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
||||||
/// in back channel communications belong to Microsoft Account.
|
/// in back channel communications belong to Microsoft Account.
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"System.Net.Http": "4.0.0.0"
|
"System.Net.Http": "4.0.0.0"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Net.Http.WebRequest": ""
|
"System.Net.Http.WebRequest": ""
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -84,7 +84,7 @@ namespace Microsoft.AspNet.Security.Twitter
|
||||||
private static HttpMessageHandler ResolveHttpMessageHandler(TwitterAuthenticationOptions options)
|
private static HttpMessageHandler ResolveHttpMessageHandler(TwitterAuthenticationOptions options)
|
||||||
{
|
{
|
||||||
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
HttpMessageHandler handler = options.BackchannelHttpHandler ??
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
new WebRequestHandler();
|
new WebRequestHandler();
|
||||||
// If they provided a validator, apply it or fail.
|
// If they provided a validator, apply it or fail.
|
||||||
if (options.BackchannelCertificateValidator != null)
|
if (options.BackchannelCertificateValidator != null)
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Security.Twitter
|
||||||
CallbackPath = new PathString("/signin-twitter");
|
CallbackPath = new PathString("/signin-twitter");
|
||||||
AuthenticationMode = AuthenticationMode.Passive;
|
AuthenticationMode = AuthenticationMode.Passive;
|
||||||
BackchannelTimeout = TimeSpan.FromSeconds(60);
|
BackchannelTimeout = TimeSpan.FromSeconds(60);
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
// Twitter lists its valid Subject Key Identifiers at https://dev.twitter.com/docs/security/using-ssl
|
// Twitter lists its valid Subject Key Identifiers at https://dev.twitter.com/docs/security/using-ssl
|
||||||
BackchannelCertificateValidator = new CertificateSubjectKeyIdentifierValidator(
|
BackchannelCertificateValidator = new CertificateSubjectKeyIdentifierValidator(
|
||||||
new[]
|
new[]
|
||||||
|
|
@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Security.Twitter
|
||||||
/// The back channel timeout.
|
/// The back channel timeout.
|
||||||
/// </value>
|
/// </value>
|
||||||
public TimeSpan BackchannelTimeout { get; set; }
|
public TimeSpan BackchannelTimeout { get; set; }
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
|
||||||
/// in back channel communications belong to Twitter.
|
/// in back channel communications belong to Twitter.
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"System.Net.Http": "4.0.0.0"
|
"System.Net.Http": "4.0.0.0"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Net.Http.WebRequest": ""
|
"System.Net.Http.WebRequest": ""
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net.Security;
|
using System.Net.Security;
|
||||||
|
|
@ -77,4 +77,4 @@ namespace Microsoft.AspNet.Security
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
@ -124,4 +124,4 @@ namespace Microsoft.AspNet.Security
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net.Security;
|
using System.Net.Security;
|
||||||
|
|
@ -70,4 +70,4 @@ namespace Microsoft.AspNet.Security
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
#if NET45
|
#if ASPNET50
|
||||||
using System;
|
using System;
|
||||||
using System.Net.Security;
|
using System.Net.Security;
|
||||||
using System.Security.Cryptography.X509Certificates;
|
using System.Security.Cryptography.X509Certificates;
|
||||||
|
|
@ -27,4 +27,4 @@ namespace Microsoft.AspNet.Security
|
||||||
bool Validate(Object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors);
|
bool Validate(Object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"Microsoft.Framework.Logging": "1.0.0-*"
|
"Microsoft.Framework.Logging": "1.0.0-*"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {},
|
"aspnet50": {},
|
||||||
"aspnetcore50": {
|
"aspnetcore50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Collections": "4.0.10.0",
|
"System.Collections": "4.0.10.0",
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"test": "Xunit.KRunner"
|
"test": "Xunit.KRunner"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"aspnet50": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Shouldly": "1.1.1.1",
|
"Shouldly": "1.1.1.1",
|
||||||
"System.Runtime": "",
|
"System.Runtime": "",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue