From f7c502a9e6150e07499c048cb2d92086f2e0f531 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 15 Jan 2015 13:57:07 -0800 Subject: [PATCH] Handle PipelineCore rename. --- .../FacebookAuthenticationHandler.cs | 2 +- .../TwitterAuthenticationHandler.cs | 2 +- src/Microsoft.AspNet.Security/AuthenticationOptions.cs | 5 ----- .../Infrastructure/HttpContextExtensions.cs | 2 +- src/Microsoft.AspNet.Security/project.json | 2 +- .../Cookies/Infrastructure/CookieChunkingTests.cs | 2 +- test/Microsoft.AspNet.Security.Test/SecurityHelperTests.cs | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationHandler.cs b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationHandler.cs index dd2b43ffe8..7eabae1019 100644 --- a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationHandler.cs @@ -9,9 +9,9 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.Http.Security; -using Microsoft.AspNet.PipelineCore.Collections; using Microsoft.AspNet.Security.OAuth; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.Logging; diff --git a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationHandler.cs b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationHandler.cs index de4dee266f..46dcd43f4c 100644 --- a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationHandler.cs @@ -10,8 +10,8 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Http.Security; -using Microsoft.AspNet.PipelineCore.Collections; using Microsoft.AspNet.Security.Infrastructure; using Microsoft.AspNet.Security.Twitter.Messages; using Microsoft.AspNet.WebUtilities; diff --git a/src/Microsoft.AspNet.Security/AuthenticationOptions.cs b/src/Microsoft.AspNet.Security/AuthenticationOptions.cs index e25383cfe3..411e134819 100644 --- a/src/Microsoft.AspNet.Security/AuthenticationOptions.cs +++ b/src/Microsoft.AspNet.Security/AuthenticationOptions.cs @@ -1,12 +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. - -using System; -using System.Collections.Generic; using Microsoft.AspNet.Http.Security; -using Microsoft.AspNet.HttpFeature.Security; -using Microsoft.AspNet.PipelineCore.Security; namespace Microsoft.AspNet.Security { diff --git a/src/Microsoft.AspNet.Security/Infrastructure/HttpContextExtensions.cs b/src/Microsoft.AspNet.Security/Infrastructure/HttpContextExtensions.cs index 59c29fe82b..642809e18c 100644 --- a/src/Microsoft.AspNet.Security/Infrastructure/HttpContextExtensions.cs +++ b/src/Microsoft.AspNet.Security/Infrastructure/HttpContextExtensions.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Http; +using Microsoft.AspNet.Http.Core.Security; using Microsoft.AspNet.HttpFeature.Security; -using Microsoft.AspNet.PipelineCore.Security; namespace Microsoft.AspNet.Security.Infrastructure { diff --git a/src/Microsoft.AspNet.Security/project.json b/src/Microsoft.AspNet.Security/project.json index cac89fbad7..6e7c66c598 100644 --- a/src/Microsoft.AspNet.Security/project.json +++ b/src/Microsoft.AspNet.Security/project.json @@ -4,7 +4,7 @@ "dependencies": { "Microsoft.AspNet.RequestContainer": "1.0.0-*", "Microsoft.AspNet.HttpFeature": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNet.PipelineCore": "1.0.0-*", + "Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*" }, diff --git a/test/Microsoft.AspNet.Security.Test/Cookies/Infrastructure/CookieChunkingTests.cs b/test/Microsoft.AspNet.Security.Test/Cookies/Infrastructure/CookieChunkingTests.cs index 4df8763bd9..04bbadf68a 100644 --- a/test/Microsoft.AspNet.Security.Test/Cookies/Infrastructure/CookieChunkingTests.cs +++ b/test/Microsoft.AspNet.Security.Test/Cookies/Infrastructure/CookieChunkingTests.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.PipelineCore; +using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Security.Cookies.Infrastructure diff --git a/test/Microsoft.AspNet.Security.Test/SecurityHelperTests.cs b/test/Microsoft.AspNet.Security.Test/SecurityHelperTests.cs index 76f8f6e0a7..dae0aed318 100644 --- a/test/Microsoft.AspNet.Security.Test/SecurityHelperTests.cs +++ b/test/Microsoft.AspNet.Security.Test/SecurityHelperTests.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Security.Claims; using System.Security.Principal; using Microsoft.AspNet.Http; -using Microsoft.AspNet.PipelineCore; +using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Security.Infrastructure; using Shouldly; using Xunit;