From a3b2d2c3ebdfa3dff3baed88d4600b4e61fd6879 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 16 Apr 2015 15:58:45 -0700 Subject: [PATCH] Handle Http.Core rename. --- .../FacebookAuthenticationHandler.cs | 2 +- .../TwitterAuthenticationHandler.cs | 2 +- .../AuthenticationServiceCollectionExtensions.cs | 1 - .../ClaimsTransformationAuthenticationHandler.cs | 1 - src/Microsoft.AspNet.Authentication/HttpContextExtensions.cs | 1 - src/Microsoft.AspNet.Authentication/project.json | 2 +- .../AuthenticationHandlerFacts.cs | 2 +- .../Cookies/Infrastructure/CookieChunkingTests.cs | 1 - .../Microsoft.AspNet.Authentication.Test/SecurityHelperTests.cs | 1 - 9 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationHandler.cs index 5f2d5b886a..d16c796eda 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationHandler.cs @@ -9,7 +9,7 @@ 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.Collections; using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Authentication.OAuth; diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs index 6f2aade300..dc0d7fc8d7 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs @@ -10,7 +10,7 @@ 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.Collections; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Authentication; using Microsoft.AspNet.Authentication.Twitter.Messages; diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs index 55b82acab6..43c0a7426b 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs @@ -5,7 +5,6 @@ using System; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.Authentication; -using Microsoft.AspNet.Http.Core.Authentication; using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection diff --git a/src/Microsoft.AspNet.Authentication/ClaimsTransformationAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication/ClaimsTransformationAuthenticationHandler.cs index bee68e7d7c..ae1599ee03 100644 --- a/src/Microsoft.AspNet.Authentication/ClaimsTransformationAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication/ClaimsTransformationAuthenticationHandler.cs @@ -5,7 +5,6 @@ using System; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Http.Core.Authentication; namespace Microsoft.AspNet.Authentication { diff --git a/src/Microsoft.AspNet.Authentication/HttpContextExtensions.cs b/src/Microsoft.AspNet.Authentication/HttpContextExtensions.cs index e378934cbc..65f7bcc101 100644 --- a/src/Microsoft.AspNet.Authentication/HttpContextExtensions.cs +++ b/src/Microsoft.AspNet.Authentication/HttpContextExtensions.cs @@ -2,7 +2,6 @@ // 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.Authentication; using Microsoft.AspNet.Http.Authentication; namespace Microsoft.AspNet.Authentication diff --git a/src/Microsoft.AspNet.Authentication/project.json b/src/Microsoft.AspNet.Authentication/project.json index 83840f36cb..8367af5f0d 100644 --- a/src/Microsoft.AspNet.Authentication/project.json +++ b/src/Microsoft.AspNet.Authentication/project.json @@ -3,8 +3,8 @@ "description": "ASP.NET 5 common types used by the various authentication middleware.", "dependencies": { "Microsoft.AspNet.DataProtection": "1.0.0-*", + "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Interfaces": "1.0.0-*", - "Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.Framework.Logging.Interfaces": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } diff --git a/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs b/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs index a8ec25fe06..ba23fea2ba 100644 --- a/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs +++ b/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http.Core; +using Microsoft.AspNet.Http; using Xunit; namespace Microsoft.AspNet.Authentication diff --git a/test/Microsoft.AspNet.Authentication.Test/Cookies/Infrastructure/CookieChunkingTests.cs b/test/Microsoft.AspNet.Authentication.Test/Cookies/Infrastructure/CookieChunkingTests.cs index c4014ad77e..20ee0a735f 100644 --- a/test/Microsoft.AspNet.Authentication.Test/Cookies/Infrastructure/CookieChunkingTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/Cookies/Infrastructure/CookieChunkingTests.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Core; using Xunit; namespace Microsoft.AspNet.Authentication.Cookies.Infrastructure diff --git a/test/Microsoft.AspNet.Authentication.Test/SecurityHelperTests.cs b/test/Microsoft.AspNet.Authentication.Test/SecurityHelperTests.cs index 3d75bd0a12..1b47c81f87 100644 --- a/test/Microsoft.AspNet.Authentication.Test/SecurityHelperTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/SecurityHelperTests.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Security.Claims; using System.Security.Principal; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Authentication; using Shouldly; using Xunit;