Updated to use the new target framework in project.json

This commit is contained in:
David Fowler 2014-09-04 01:47:16 -07:00
parent 565fde5187
commit 810c96e939
21 changed files with 33 additions and 33 deletions

View File

@ -13,7 +13,7 @@
},
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
"frameworks": {
"net45": {
"aspnet50": {
},
"aspnetcore50": {
"dependencies": {

View File

@ -14,7 +14,7 @@
},
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
"frameworks": {
"net45": {
"aspnet50": {
},
"aspnetcore50": {
"dependencies": {

View File

@ -13,7 +13,7 @@
"Newtonsoft.Json": "5.0.8"
},
"frameworks": {
"net45": {},
"aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Collections": "4.0.10.0",

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;
@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Security.Facebook
private static HttpMessageHandler ResolveHttpMessageHandler(FacebookAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if NET45
#if ASPNET50
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

View File

@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Security.Facebook
/// Gets or sets the Facebook-assigned app secret.
/// </summary>
public string AppSecret { get; set; }
#if NET45
#if ASPNET50
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Facebook.

View File

@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
"net45": {
"aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}

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;
@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Security.Google
private static HttpMessageHandler ResolveHttpMessageHandler(GoogleAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if NET45
#if ASPNET50
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

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;
@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Security.Google
/// Gets or sets the Google-assigned client secret.
/// </summary>
public string ClientSecret { get; set; }
#if NET45
#if ASPNET50
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Google.

View File

@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
"net45": {
"aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}

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;
@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Security.MicrosoftAccount
private static HttpMessageHandler ResolveHttpMessageHandler(MicrosoftAccountAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if NET45
#if ASPNET50
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

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;
@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Security.MicrosoftAccount
Scope = new List<string>();
BackchannelTimeout = TimeSpan.FromSeconds(60);
}
#if NET45
#if ASPNET50
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Microsoft Account.

View File

@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
"net45": {
"aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}

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;
@ -84,7 +84,7 @@ namespace Microsoft.AspNet.Security.Twitter
private static HttpMessageHandler ResolveHttpMessageHandler(TwitterAuthenticationOptions options)
{
HttpMessageHandler handler = options.BackchannelHttpHandler ??
#if NET45
#if ASPNET50
new WebRequestHandler();
// If they provided a validator, apply it or fail.
if (options.BackchannelCertificateValidator != null)

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;
@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Security.Twitter
CallbackPath = new PathString("/signin-twitter");
AuthenticationMode = AuthenticationMode.Passive;
BackchannelTimeout = TimeSpan.FromSeconds(60);
#if NET45
#if ASPNET50
// Twitter lists its valid Subject Key Identifiers at https://dev.twitter.com/docs/security/using-ssl
BackchannelCertificateValidator = new CertificateSubjectKeyIdentifierValidator(
new[]
@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Security.Twitter
/// The back channel timeout.
/// </value>
public TimeSpan BackchannelTimeout { get; set; }
#if NET45
#if ASPNET50
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Twitter.

View File

@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
"net45": {
"aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}

View File

@ -1,7 +1,7 @@
// 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 NET45
#if ASPNET50
using System;
using System.Collections.Generic;
using System.Net.Security;
@ -77,4 +77,4 @@ namespace Microsoft.AspNet.Security
}
}
}
#endif
#endif

View File

@ -1,7 +1,7 @@
// 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 NET45
#if ASPNET50
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -124,4 +124,4 @@ namespace Microsoft.AspNet.Security
}
}
}
#endif
#endif

View File

@ -1,7 +1,7 @@
// 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 NET45
#if ASPNET50
using System;
using System.Collections.Generic;
using System.Net.Security;
@ -70,4 +70,4 @@ namespace Microsoft.AspNet.Security
}
}
}
#endif
#endif

View File

@ -1,7 +1,7 @@
// 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 NET45
#if ASPNET50
using System;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
@ -27,4 +27,4 @@ namespace Microsoft.AspNet.Security
bool Validate(Object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors);
}
}
#endif
#endif

View File

@ -10,7 +10,7 @@
"Microsoft.Framework.Logging": "1.0.0-*"
},
"frameworks": {
"net45": {},
"aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Collections": "4.0.10.0",

View File

@ -20,7 +20,7 @@
"test": "Xunit.KRunner"
},
"frameworks": {
"net45": {
"aspnet50": {
"dependencies": {
"Shouldly": "1.1.1.1",
"System.Runtime": "",