From ca67e93bc7c241ec67d415e12e7d6fdae7f2520b Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Tue, 6 May 2014 11:22:59 -0700 Subject: [PATCH] Fix dependency issues --- .../IdentityBuilderExtensions.cs | 2 +- src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs | 4 ++-- src/Microsoft.AspNet.Identity.Entity/project.json | 2 +- .../IdentityBuilderExtensions.cs | 2 +- src/Microsoft.AspNet.Identity.InMemory/project.json | 2 +- src/Microsoft.AspNet.Identity.Security/SignInManager.cs | 2 +- src/Microsoft.AspNet.Identity.Security/project.json | 2 +- src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs | 2 +- src/Microsoft.AspNet.Identity/IdentityBuilder.cs | 2 +- .../IdentityServiceCollectionExtensions.cs | 2 +- src/Microsoft.AspNet.Identity/IdentityServices.cs | 2 +- src/Microsoft.AspNet.Identity/RoleManager.cs | 4 ++-- src/Microsoft.AspNet.Identity/UserManager.cs | 4 ++-- src/Microsoft.AspNet.Identity/project.json | 2 +- test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs | 4 ++-- .../TestIdentityFactory.cs | 4 ++-- test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Entity.Test/project.json | 4 ++-- .../InMemoryStoreTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.InMemory.Test/project.json | 2 +- .../SignInManagerTest.cs | 6 +++--- test/Microsoft.AspNet.Identity.Security.Test/project.json | 4 ++-- .../ClaimsIdentityFactoryTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs | 4 ++-- test/Microsoft.AspNet.Identity.Test/project.json | 2 +- test/Shared/IdentityConfig.cs | 2 +- test/Shared/MockHelpers.cs | 4 ++-- test/Shared/UserManagerTestBase.cs | 4 ++-- 34 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs b/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs index 93411053e4..db3a4a2edd 100644 --- a/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs @@ -1,5 +1,5 @@ using Microsoft.AspNet.Identity.Entity; -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Identity { diff --git a/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs b/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs index a3e09da0e7..16c758cc3b 100644 --- a/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs +++ b/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs @@ -16,8 +16,8 @@ // permissions and limitations under the License. using System; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Data.Entity; using Microsoft.Data.Entity.SqlServer; using Microsoft.Data.Entity.InMemory; diff --git a/src/Microsoft.AspNet.Identity.Entity/project.json b/src/Microsoft.AspNet.Identity.Entity/project.json index 2f2b90db61..073d924609 100644 --- a/src/Microsoft.AspNet.Identity.Entity/project.json +++ b/src/Microsoft.AspNet.Identity.Entity/project.json @@ -2,7 +2,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection": "0.1-alpha-*", "Microsoft.AspNet.Identity": "", "Microsoft.Data.Entity": "0.1-alpha-*", "Microsoft.Data.Entity.Relational": "0.1-alpha-*", diff --git a/src/Microsoft.AspNet.Identity.InMemory/IdentityBuilderExtensions.cs b/src/Microsoft.AspNet.Identity.InMemory/IdentityBuilderExtensions.cs index 7949445f41..758ea32359 100644 --- a/src/Microsoft.AspNet.Identity.InMemory/IdentityBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Identity.InMemory/IdentityBuilderExtensions.cs @@ -1,5 +1,5 @@ using Microsoft.AspNet.Identity.InMemory; -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Identity { diff --git a/src/Microsoft.AspNet.Identity.InMemory/project.json b/src/Microsoft.AspNet.Identity.InMemory/project.json index fc329300ae..65986ca463 100644 --- a/src/Microsoft.AspNet.Identity.InMemory/project.json +++ b/src/Microsoft.AspNet.Identity.InMemory/project.json @@ -2,7 +2,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.AspNet.Identity": "", - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "System.Security.Claims": "0.1-alpha-*" }, "configurations": { diff --git a/src/Microsoft.AspNet.Identity.Security/SignInManager.cs b/src/Microsoft.AspNet.Identity.Security/SignInManager.cs index a33b696731..e21dc27d70 100644 --- a/src/Microsoft.AspNet.Identity.Security/SignInManager.cs +++ b/src/Microsoft.AspNet.Identity.Security/SignInManager.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; using System; using System.Security.Claims; using System.Threading.Tasks; diff --git a/src/Microsoft.AspNet.Identity.Security/project.json b/src/Microsoft.AspNet.Identity.Security/project.json index 45b9480d74..d7d14ee4f3 100644 --- a/src/Microsoft.AspNet.Identity.Security/project.json +++ b/src/Microsoft.AspNet.Identity.Security/project.json @@ -1,7 +1,7 @@ { "version": "0.1-alpha-*", "dependencies": { - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "System.Security.Claims" : "0.1-alpha-*", "Microsoft.AspNet.Http" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "", diff --git a/src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs b/src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs index 52fc686dc5..b0f8e7038d 100644 --- a/src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs +++ b/src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs @@ -19,7 +19,7 @@ using System; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Identity { diff --git a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs b/src/Microsoft.AspNet.Identity/IdentityBuilder.cs index 61d539a0ee..e8d7381673 100644 --- a/src/Microsoft.AspNet.Identity/IdentityBuilder.cs +++ b/src/Microsoft.AspNet.Identity/IdentityBuilder.cs @@ -15,7 +15,7 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; using System; namespace Microsoft.AspNet.Identity diff --git a/src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs index ac565f8b1c..2b27706bc4 100644 --- a/src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Identity/IdentityServiceCollectionExtensions.cs @@ -18,7 +18,7 @@ using Microsoft.AspNet.Identity; using System; -namespace Microsoft.AspNet.DependencyInjection +namespace Microsoft.Framework.DependencyInjection { public static class IdentityServiceCollectionExtensions { diff --git a/src/Microsoft.AspNet.Identity/IdentityServices.cs b/src/Microsoft.AspNet.Identity/IdentityServices.cs index e9e8fe5c7e..0c031ede10 100644 --- a/src/Microsoft.AspNet.Identity/IdentityServices.cs +++ b/src/Microsoft.AspNet.Identity/IdentityServices.cs @@ -16,7 +16,7 @@ // permissions and limitations under the License. using Microsoft.Framework.ConfigurationModel; -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; using System; using System.Collections.Generic; diff --git a/src/Microsoft.AspNet.Identity/RoleManager.cs b/src/Microsoft.AspNet.Identity/RoleManager.cs index a487edae04..e75d455859 100644 --- a/src/Microsoft.AspNet.Identity/RoleManager.cs +++ b/src/Microsoft.AspNet.Identity/RoleManager.cs @@ -19,8 +19,8 @@ using System; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; namespace Microsoft.AspNet.Identity { diff --git a/src/Microsoft.AspNet.Identity/UserManager.cs b/src/Microsoft.AspNet.Identity/UserManager.cs index 0603d2ec19..4a1f555c95 100644 --- a/src/Microsoft.AspNet.Identity/UserManager.cs +++ b/src/Microsoft.AspNet.Identity/UserManager.cs @@ -23,8 +23,8 @@ using System.Security.Claims; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; namespace Microsoft.AspNet.Identity { diff --git a/src/Microsoft.AspNet.Identity/project.json b/src/Microsoft.AspNet.Identity/project.json index 7871c9baec..0094995340 100644 --- a/src/Microsoft.AspNet.Identity/project.json +++ b/src/Microsoft.AspNet.Identity/project.json @@ -2,7 +2,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*", "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*", "System.Security.Claims" : "0.1-alpha-*" diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs index 5504040144..696dd2a27c 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs @@ -17,8 +17,8 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Data.Entity; using Microsoft.Data.Entity.InMemory; using Xunit; diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs index 612dc99a7f..b1b26ec9b8 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.AspNet.Http; using Microsoft.AspNet.Identity.Entity; using Microsoft.AspNet.PipelineCore; diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs b/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs index a4ab7e0c03..20af156d26 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs @@ -16,8 +16,8 @@ // permissions and limitations under the License. using Microsoft.AspNet.Testing; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Storage; diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs index e195f8d78c..e0991ae7dc 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs +++ b/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs @@ -15,8 +15,8 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.AspNet.Testing; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Metadata; diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/project.json b/test/Microsoft.AspNet.Identity.Entity.Test/project.json index e3d72f9ab6..c855d91486 100644 --- a/test/Microsoft.AspNet.Identity.Entity.Test/project.json +++ b/test/Microsoft.AspNet.Identity.Entity.Test/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.AspNet.Http": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection": "0.1-alpha-*", "Microsoft.AspNet.Identity.Entity": "", "Microsoft.AspNet.PipelineCore": "0.1-alpha-*", - "Microsoft.AspNet.Logging": "0.1-alpha-*", + "Microsoft.Framework.Logging": "0.1-alpha-*", "Microsoft.AspNet.RequestContainer": "0.1-alpha-*", "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*", "Microsoft.AspNet.Testing": "0.1-alpha-*", diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs index b37c458722..4ee266d2ea 100644 --- a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs +++ b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs @@ -20,8 +20,8 @@ using System.Linq; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.AspNet.Identity.Test; namespace Microsoft.AspNet.Identity.InMemory.Test diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs index 9802b89068..0bd2e7c733 100644 --- a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs +++ b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs @@ -18,8 +18,8 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.AspNet.Http; using Microsoft.AspNet.Identity.Test; using Microsoft.AspNet.PipelineCore; diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json index e3339647de..251c086a9e 100644 --- a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json +++ b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.AspNet.Http" : "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*", "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*", diff --git a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs index 33fa92ee82..1b63402d38 100644 --- a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs +++ b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs @@ -17,13 +17,13 @@ using System; using System.Threading; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Security; using Microsoft.AspNet.Identity.InMemory; using Microsoft.AspNet.Identity.Test; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.Logging; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.Logging; using Microsoft.AspNet.PipelineCore; using Microsoft.AspNet.FeatureModel; using Microsoft.AspNet.Security.Cookies; diff --git a/test/Microsoft.AspNet.Identity.Security.Test/project.json b/test/Microsoft.AspNet.Identity.Security.Test/project.json index 227058967f..b7bfa6c801 100644 --- a/test/Microsoft.AspNet.Identity.Security.Test/project.json +++ b/test/Microsoft.AspNet.Identity.Security.Test/project.json @@ -3,11 +3,11 @@ "dependencies": { "Microsoft.AspNet.Http" : "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*", "Microsoft.AspNet.Identity.Security" : "0.1-alpha-*", - "Microsoft.AspNet.Logging" : "0.1-alpha-*", + "Microsoft.Framework.Logging" : "0.1-alpha-*", "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*", "Microsoft.AspNet.FeatureModel" : "0.1-alpha-*", "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*", diff --git a/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs b/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs index cc1eec092e..e224761d71 100644 --- a/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/ClaimsIdentityFactoryTest.cs @@ -20,8 +20,8 @@ using System.Linq; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs index a087eaf117..956b225f02 100644 --- a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs @@ -16,8 +16,8 @@ // permissions and limitations under the License. using System.Security.Claims; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Xunit; namespace Microsoft.AspNet.Identity.Test diff --git a/test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs index b180d9bf59..a415881a98 100644 --- a/test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/RoleManagerTest.cs @@ -19,8 +19,8 @@ using System; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Xunit; namespace Microsoft.AspNet.Identity.Test diff --git a/test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs b/test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs index 55c8c38738..440ed26320 100644 --- a/test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/RoleValidatorTest.cs @@ -17,8 +17,8 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Xunit; namespace Microsoft.AspNet.Identity.Test diff --git a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs index 1d0719aa4e..a70d783e2f 100644 --- a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs @@ -15,8 +15,8 @@ // See the Apache 2 License for the specific language governing // permissions and limitations under the License. -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Moq; using System; using System.Collections.Generic; diff --git a/test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs b/test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs index c8fe257c04..ceb10d91b3 100644 --- a/test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/UserValidatorTest.cs @@ -17,8 +17,8 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Xunit; namespace Microsoft.AspNet.Identity.Test diff --git a/test/Microsoft.AspNet.Identity.Test/project.json b/test/Microsoft.AspNet.Identity.Test/project.json index f14b2ea47b..f785f71cba 100644 --- a/test/Microsoft.AspNet.Identity.Test/project.json +++ b/test/Microsoft.AspNet.Identity.Test/project.json @@ -2,7 +2,7 @@ "version": "0.1-alpha-*", "dependencies": { "Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*", - "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*", + "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*", "Microsoft.AspNet.Identity" : "0.1-alpha-*", "Microsoft.AspNet.Testing" : "0.1-alpha-*", "Xunit.KRunner": "0.1-alpha-*", diff --git a/test/Shared/IdentityConfig.cs b/test/Shared/IdentityConfig.cs index 057c31f48b..350a7adaf8 100644 --- a/test/Shared/IdentityConfig.cs +++ b/test/Shared/IdentityConfig.cs @@ -1,5 +1,5 @@ using System; -using Microsoft.AspNet.DependencyInjection; +using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Identity.Test { diff --git a/test/Shared/MockHelpers.cs b/test/Shared/MockHelpers.cs index a14e795b86..215ff6f5a4 100644 --- a/test/Shared/MockHelpers.cs +++ b/test/Shared/MockHelpers.cs @@ -1,7 +1,7 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Moq; namespace Microsoft.AspNet.Identity.Test diff --git a/test/Shared/UserManagerTestBase.cs b/test/Shared/UserManagerTestBase.cs index 74001c18c7..66a41e4102 100644 --- a/test/Shared/UserManagerTestBase.cs +++ b/test/Shared/UserManagerTestBase.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.DependencyInjection; -using Microsoft.AspNet.DependencyInjection.Fallback; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.AspNet.Identity.Test; using Microsoft.AspNet.Testing; using Xunit;