diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json
index c405745f10..c8eabcb68c 100644
--- a/samples/CookieSample/project.json
+++ b/samples/CookieSample/project.json
@@ -13,7 +13,7 @@
},
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
"frameworks": {
- "net45": {
+ "aspnet50": {
},
"aspnetcore50": {
"dependencies": {
diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json
index 8703a24bf7..ed77607d2b 100644
--- a/samples/SocialSample/project.json
+++ b/samples/SocialSample/project.json
@@ -14,7 +14,7 @@
},
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
"frameworks": {
- "net45": {
+ "aspnet50": {
},
"aspnetcore50": {
"dependencies": {
diff --git a/src/Microsoft.AspNet.Security.Cookies/project.json b/src/Microsoft.AspNet.Security.Cookies/project.json
index 0a3d6d36db..9d9e58616a 100644
--- a/src/Microsoft.AspNet.Security.Cookies/project.json
+++ b/src/Microsoft.AspNet.Security.Cookies/project.json
@@ -13,7 +13,7 @@
"Newtonsoft.Json": "5.0.8"
},
"frameworks": {
- "net45": {},
+ "aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Collections": "4.0.10.0",
diff --git a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs
index af1da5c300..e67abf1c91 100644
--- a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs
@@ -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)
diff --git a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationOptions.cs b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationOptions.cs
index 1b9d2c145e..1d4fa9a54c 100644
--- a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationOptions.cs
+++ b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationOptions.cs
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Security.Facebook
/// Gets or sets the Facebook-assigned app secret.
///
public string AppSecret { get; set; }
-#if NET45
+#if ASPNET50
///
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Facebook.
diff --git a/src/Microsoft.AspNet.Security.Facebook/project.json b/src/Microsoft.AspNet.Security.Facebook/project.json
index 608aa0b6d3..bf9da22531 100644
--- a/src/Microsoft.AspNet.Security.Facebook/project.json
+++ b/src/Microsoft.AspNet.Security.Facebook/project.json
@@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}
diff --git a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs
index 1105b149ba..66768cbb84 100644
--- a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs
@@ -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)
diff --git a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationOptions.cs b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationOptions.cs
index f03b7d2efc..1ede9f0425 100644
--- a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationOptions.cs
+++ b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationOptions.cs
@@ -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.
///
public string ClientSecret { get; set; }
-#if NET45
+#if ASPNET50
///
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Google.
diff --git a/src/Microsoft.AspNet.Security.Google/project.json b/src/Microsoft.AspNet.Security.Google/project.json
index 608aa0b6d3..bf9da22531 100644
--- a/src/Microsoft.AspNet.Security.Google/project.json
+++ b/src/Microsoft.AspNet.Security.Google/project.json
@@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}
diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs
index 0bd8f4c3e0..3f5e24cecf 100644
--- a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs
@@ -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)
diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationOptions.cs b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationOptions.cs
index 47ee6fe0e7..7668b0d085 100644
--- a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationOptions.cs
+++ b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationOptions.cs
@@ -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();
BackchannelTimeout = TimeSpan.FromSeconds(60);
}
-#if NET45
+#if ASPNET50
///
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Microsoft Account.
diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json b/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json
index 3457c15c99..83bc4823bd 100644
--- a/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json
+++ b/src/Microsoft.AspNet.Security.MicrosoftAccount/project.json
@@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}
diff --git a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs
index 421a685575..5961762191 100644
--- a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs
@@ -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)
diff --git a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationOptions.cs b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationOptions.cs
index fcf307d5c4..043911e759 100644
--- a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationOptions.cs
+++ b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationOptions.cs
@@ -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.
///
public TimeSpan BackchannelTimeout { get; set; }
-#if NET45
+#if ASPNET50
///
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
/// in back channel communications belong to Twitter.
diff --git a/src/Microsoft.AspNet.Security.Twitter/project.json b/src/Microsoft.AspNet.Security.Twitter/project.json
index 608aa0b6d3..bf9da22531 100644
--- a/src/Microsoft.AspNet.Security.Twitter/project.json
+++ b/src/Microsoft.AspNet.Security.Twitter/project.json
@@ -11,7 +11,7 @@
"System.Net.Http": "4.0.0.0"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Net.Http.WebRequest": ""
}
diff --git a/src/Microsoft.AspNet.Security/CertificateSubjectKeyIdentifierValidator.cs b/src/Microsoft.AspNet.Security/CertificateSubjectKeyIdentifierValidator.cs
index d91311202b..68cf5abd28 100644
--- a/src/Microsoft.AspNet.Security/CertificateSubjectKeyIdentifierValidator.cs
+++ b/src/Microsoft.AspNet.Security/CertificateSubjectKeyIdentifierValidator.cs
@@ -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
\ No newline at end of file
+#endif
diff --git a/src/Microsoft.AspNet.Security/CertificateSubjectPublicKeyInfoValidator.cs b/src/Microsoft.AspNet.Security/CertificateSubjectPublicKeyInfoValidator.cs
index a0ba223103..4ad5ee81c6 100644
--- a/src/Microsoft.AspNet.Security/CertificateSubjectPublicKeyInfoValidator.cs
+++ b/src/Microsoft.AspNet.Security/CertificateSubjectPublicKeyInfoValidator.cs
@@ -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
\ No newline at end of file
+#endif
diff --git a/src/Microsoft.AspNet.Security/CertificateThumbprintValidator.cs b/src/Microsoft.AspNet.Security/CertificateThumbprintValidator.cs
index 9a9dadf60c..a276536a70 100644
--- a/src/Microsoft.AspNet.Security/CertificateThumbprintValidator.cs
+++ b/src/Microsoft.AspNet.Security/CertificateThumbprintValidator.cs
@@ -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
\ No newline at end of file
+#endif
diff --git a/src/Microsoft.AspNet.Security/ICertificateValidator.cs b/src/Microsoft.AspNet.Security/ICertificateValidator.cs
index 3157a5c5aa..26756324ff 100644
--- a/src/Microsoft.AspNet.Security/ICertificateValidator.cs
+++ b/src/Microsoft.AspNet.Security/ICertificateValidator.cs
@@ -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
\ No newline at end of file
+#endif
diff --git a/src/Microsoft.AspNet.Security/project.json b/src/Microsoft.AspNet.Security/project.json
index f328ce7501..d547252967 100644
--- a/src/Microsoft.AspNet.Security/project.json
+++ b/src/Microsoft.AspNet.Security/project.json
@@ -10,7 +10,7 @@
"Microsoft.Framework.Logging": "1.0.0-*"
},
"frameworks": {
- "net45": {},
+ "aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Collections": "4.0.10.0",
diff --git a/test/Microsoft.AspNet.Security.Test/project.json b/test/Microsoft.AspNet.Security.Test/project.json
index 4cfa4fb96a..49f7858ad5 100644
--- a/test/Microsoft.AspNet.Security.Test/project.json
+++ b/test/Microsoft.AspNet.Security.Test/project.json
@@ -20,7 +20,7 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"Shouldly": "1.1.1.1",
"System.Runtime": "",