From 952bc6af882f495d7efcd4ca6b2bb570c258b849 Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Mon, 25 Aug 2014 11:10:10 -0700
Subject: [PATCH] Rename Identity.EF -> Identity.SqlServer

---
 Identity.sln                                                | 6 +++---
 samples/IdentitySample.Mvc/Models/IdentityModels.cs         | 2 +-
 samples/IdentitySample.Mvc/project.json                     | 2 +-
 .../IdentityDbContext.cs                                    | 2 +-
 .../IdentityEntityFrameworkServiceCollectionExtensions.cs   | 2 +-
 .../Microsoft.AspNet.Identity.SqlServer.kproj}              | 0
 .../Properties/Resources.Designer.cs                        | 4 ++--
 .../Resources.resx                                          | 0
 .../RoleStore.cs                                            | 2 +-
 .../UserStore.cs                                            | 2 +-
 .../project.json                                            | 0
 .../Properties/Resources.Designer.cs                        | 4 ++--
 .../EntityInMemoryTestServiceCollectionExtensions.cs        | 4 ++--
 .../InMemoryContext.cs                                      | 2 +-
 .../InMemoryEFUserStoreTest.cs                              | 2 +-
 .../InMemoryUserStore.cs                                    | 2 +-
 ...Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj} | 0
 .../RoleStoreTest.cs                                        | 2 +-
 .../TestIdentityFactory.cs                                  | 2 +-
 .../project.json                                            | 2 +-
 .../CustomPocoTest.cs                                       | 2 +-
 .../DefaultPocoTest.cs                                      | 2 +-
 .../Microsoft.AspNet.Identity.SqlServer.Test.kproj}         | 0
 .../SqlStoreTestBase.cs                                     | 2 +-
 .../UserStoreGuidKeyTest.cs                                 | 4 ++--
 .../UserStoreIntKeyTest.cs                                  | 4 ++--
 .../UserStoreStringKeyTest.cs                               | 6 +++---
 .../UserStoreTest.cs                                        | 4 ++--
 .../project.json                                            | 2 +-
 29 files changed, 34 insertions(+), 34 deletions(-)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/IdentityDbContext.cs (99%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/IdentityEntityFrameworkServiceCollectionExtensions.cs (98%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework/Microsoft.AspNet.Identity.EntityFramework.kproj => Microsoft.AspNet.Identity.SqlServer/Microsoft.AspNet.Identity.SqlServer.kproj} (100%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/Properties/Resources.Designer.cs (90%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/Resources.resx (100%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/RoleStore.cs (99%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/UserStore.cs (99%)
 rename src/{Microsoft.AspNet.Identity.EntityFramework => Microsoft.AspNet.Identity.SqlServer}/project.json (100%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/EntityInMemoryTestServiceCollectionExtensions.cs (93%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/InMemoryContext.cs (97%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/InMemoryEFUserStoreTest.cs (96%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/InMemoryUserStore.cs (99%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj => Microsoft.AspNet.Identity.SqlServer.InMemory.Test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj} (100%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/RoleStoreTest.cs (98%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/TestIdentityFactory.cs (96%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.InMemory.Test => Microsoft.AspNet.Identity.SqlServer.InMemory.Test}/project.json (93%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/CustomPocoTest.cs (99%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/DefaultPocoTest.cs (97%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test/Microsoft.AspNet.Identity.EntityFramework.Test.kproj => Microsoft.AspNet.Identity.SqlServer.Test/Microsoft.AspNet.Identity.SqlServer.Test.kproj} (100%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/SqlStoreTestBase.cs (99%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/UserStoreGuidKeyTest.cs (95%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/UserStoreIntKeyTest.cs (90%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/UserStoreStringKeyTest.cs (85%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/UserStoreTest.cs (99%)
 rename test/{Microsoft.AspNet.Identity.EntityFramework.Test => Microsoft.AspNet.Identity.SqlServer.Test}/project.json (93%)

diff --git a/Identity.sln b/Identity.sln
index 7eb7cf434f..bc462d16f5 100644
--- a/Identity.sln
+++ b/Identity.sln
@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-6
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity", "src\Microsoft.AspNet.Identity\Microsoft.AspNet.Identity.kproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework", "src\Microsoft.AspNet.Identity.EntityFramework\Microsoft.AspNet.Identity.EntityFramework.kproj", "{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.SqlServer", "src\Microsoft.AspNet.Identity.SqlServer\Microsoft.AspNet.Identity.SqlServer.kproj", "{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Authentication", "src\Microsoft.AspNet.Identity.Authentication\Microsoft.AspNet.Identity.Authentication.kproj", "{7B4CFF5A-1948-45EC-B170-6EB7C039B2F9}"
 EndProject
@@ -19,9 +19,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.A
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.InMemory.Test", "test\Microsoft.AspNet.Identity.InMemory.Test\Microsoft.AspNet.Identity.InMemory.Test.kproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework.Test", "test\Microsoft.AspNet.Identity.EntityFramework.Test\Microsoft.AspNet.Identity.EntityFramework.Test.kproj", "{B4C067C1-F934-493C-9DBC-19E8CA305613}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.SqlServer.Test", "test\Microsoft.AspNet.Identity.SqlServer.Test\Microsoft.AspNet.Identity.SqlServer.Test.kproj", "{B4C067C1-F934-493C-9DBC-19E8CA305613}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework.InMemory.Test", "test\Microsoft.AspNet.Identity.EntityFramework.InMemory.Test\Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj", "{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.SqlServer.InMemory.Test", "test\Microsoft.AspNet.Identity.SqlServer.InMemory.Test\Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj", "{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}"
 EndProject
diff --git a/samples/IdentitySample.Mvc/Models/IdentityModels.cs b/samples/IdentitySample.Mvc/Models/IdentityModels.cs
index 50bdfc34dd..8e3a57b63a 100644
--- a/samples/IdentitySample.Mvc/Models/IdentityModels.cs
+++ b/samples/IdentitySample.Mvc/Models/IdentityModels.cs
@@ -1,6 +1,6 @@
 using System;
 using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNet.Identity.SqlServer;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json
index b6724cceeb..ffb11006fb 100644
--- a/samples/IdentitySample.Mvc/project.json
+++ b/samples/IdentitySample.Mvc/project.json
@@ -9,7 +9,7 @@
         "Microsoft.AspNet.Mvc": "6.0.0-*",
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
         "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-        "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
+        "Microsoft.AspNet.Identity.SqlServer": "3.0.0-*",
         "Microsoft.AspNet.Identity.Authentication": "3.0.0-*",
         "Microsoft.AspNet.Security.Cookies": "1.0.0-*",
         "Microsoft.AspNet.StaticFiles": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs b/src/Microsoft.AspNet.Identity.SqlServer/IdentityDbContext.cs
similarity index 99%
rename from src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
rename to src/Microsoft.AspNet.Identity.SqlServer/IdentityDbContext.cs
index 0efe8a0af8..01ac2842d4 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
+++ b/src/Microsoft.AspNet.Identity.SqlServer/IdentityDbContext.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
 
-namespace Microsoft.AspNet.Identity.EntityFramework
+namespace Microsoft.AspNet.Identity.SqlServer
 {
     public class IdentityDbContext :
         IdentityDbContext<IdentityUser, IdentityRole, string>
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkServiceCollectionExtensions.cs
similarity index 98%
rename from src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkServiceCollectionExtensions.cs
rename to src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkServiceCollectionExtensions.cs
index 86f0f70a18..1ecfe159c6 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkServiceCollectionExtensions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNet.Identity.SqlServer;
 using Microsoft.Data.Entity;
 using System;
 
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/Microsoft.AspNet.Identity.EntityFramework.kproj b/src/Microsoft.AspNet.Identity.SqlServer/Microsoft.AspNet.Identity.SqlServer.kproj
similarity index 100%
rename from src/Microsoft.AspNet.Identity.EntityFramework/Microsoft.AspNet.Identity.EntityFramework.kproj
rename to src/Microsoft.AspNet.Identity.SqlServer/Microsoft.AspNet.Identity.SqlServer.kproj
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Identity.SqlServer/Properties/Resources.Designer.cs
similarity index 90%
rename from src/Microsoft.AspNet.Identity.EntityFramework/Properties/Resources.Designer.cs
rename to src/Microsoft.AspNet.Identity.SqlServer/Properties/Resources.Designer.cs
index 540771d085..80a2517ffd 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Identity.SqlServer/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.Identity.EntityFramework
+namespace Microsoft.AspNet.Identity.SqlServer
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.Identity.EntityFramework.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNet.Identity.SqlServer.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// Role {0} does not exist.
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/Resources.resx b/src/Microsoft.AspNet.Identity.SqlServer/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Identity.EntityFramework/Resources.resx
rename to src/Microsoft.AspNet.Identity.SqlServer/Resources.resx
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs b/src/Microsoft.AspNet.Identity.SqlServer/RoleStore.cs
similarity index 99%
rename from src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs
rename to src/Microsoft.AspNet.Identity.SqlServer/RoleStore.cs
index 32ff1aa50e..bdda426f64 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs
+++ b/src/Microsoft.AspNet.Identity.SqlServer/RoleStore.cs
@@ -10,7 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 
-namespace Microsoft.AspNet.Identity.EntityFramework
+namespace Microsoft.AspNet.Identity.SqlServer
 {
     public class RoleStore<TRole> : RoleStore<TRole, DbContext, string> where TRole : IdentityRole
     {
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs b/src/Microsoft.AspNet.Identity.SqlServer/UserStore.cs
similarity index 99%
rename from src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs
rename to src/Microsoft.AspNet.Identity.SqlServer/UserStore.cs
index 96cad52530..4d10dbb126 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs
+++ b/src/Microsoft.AspNet.Identity.SqlServer/UserStore.cs
@@ -11,7 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 
-namespace Microsoft.AspNet.Identity.EntityFramework
+namespace Microsoft.AspNet.Identity.SqlServer
 {
     public class UserStore : UserStore<IdentityUser>
     {
diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/project.json b/src/Microsoft.AspNet.Identity.SqlServer/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Identity.EntityFramework/project.json
rename to src/Microsoft.AspNet.Identity.SqlServer/project.json
diff --git a/src/Microsoft.AspNet.Identity/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Identity/Properties/Resources.Designer.cs
index 572f49f4f4..785e06b674 100644
--- a/src/Microsoft.AspNet.Identity/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Identity/Properties/Resources.Designer.cs
@@ -219,7 +219,7 @@ namespace Microsoft.AspNet.Identity
         }
 
         /// <summary>
-        /// Passwords must have at least one non letter or digit character.
+        /// Passwords must have at least one non letter and non digit character.
         /// </summary>
         internal static string PasswordRequireNonLetterOrDigit
         {
@@ -227,7 +227,7 @@ namespace Microsoft.AspNet.Identity
         }
 
         /// <summary>
-        /// Passwords must have at least one non letter or digit character.
+        /// Passwords must have at least one non letter and non digit character.
         /// </summary>
         internal static string FormatPasswordRequireNonLetterOrDigit()
         {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
similarity index 93%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
index ebbb92a98d..95811d7613 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
 // 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 Microsoft.AspNet.Identity.EntityFramework;
-using Microsoft.AspNet.Identity.EntityFramework.InMemory.Test;
+using Microsoft.AspNet.Identity.SqlServer;
+using Microsoft.AspNet.Identity.SqlServer.InMemory.Test;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryContext.cs
similarity index 97%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryContext.cs
index fae7f5db2a..7feea9f8c4 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryContext.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
+namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
 {
     public class InMemoryContext :
         InMemoryContext<IdentityUser, IdentityRole, string, IdentityUserLogin, IdentityUserRole, IdentityUserClaim>
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryEFUserStoreTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryEFUserStoreTest.cs
index 37e8a298e1..70e3d9eaf6 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryEFUserStoreTest.cs
@@ -6,7 +6,7 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
+namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
 {
     public class InMemoryEFUserStoreTest : UserManagerTestBase<IdentityUser, IdentityRole> 
     {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryUserStore.cs b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryUserStore.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryUserStore.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryUserStore.cs
index c66a2eb85b..1374a107b9 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryUserStore.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryUserStore.cs
@@ -11,7 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
+namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
 {
     public class InMemoryUserStore : InMemoryUserStore<IdentityUser, InMemoryContext>
     {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj
similarity index 100%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/RoleStoreTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/RoleStoreTest.cs
index e6adbc9247..8437a7a6ac 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/RoleStoreTest.cs
@@ -8,7 +8,7 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
+namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
 {
     public class RoleStoreTest
     {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/TestIdentityFactory.cs
similarity index 96%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/TestIdentityFactory.cs
index 3c24bbdc3c..d4395312b6 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/TestIdentityFactory.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Identity.Test;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
+namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
 {
     public static class TestIdentityFactory
     {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
similarity index 93%
rename from test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
rename to test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
index 47736d6de7..0425b43af1 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Identity": "",
-    "Microsoft.AspNet.Identity.EntityFramework": "",
+    "Microsoft.AspNet.Identity.SqlServer": "",
     "Microsoft.AspNet.PipelineCore": "1.0.0-*",
     "Microsoft.AspNet.RequestContainer": "1.0.0-*",
     "Microsoft.AspNet.Security.DataProtection": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/CustomPocoTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/CustomPocoTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/CustomPocoTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/CustomPocoTest.cs
index 6c75f6d483..00cdc6ce74 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/CustomPocoTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/CustomPocoTest.cs
@@ -10,7 +10,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
     public class CustomPocoTest
     {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/DefaultPocoTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/DefaultPocoTest.cs
index 911f941313..b4f1ddb7ee 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/DefaultPocoTest.cs
@@ -9,7 +9,7 @@ using Microsoft.Framework.DependencyInjection.Fallback;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
     public class DefaultPocoTest
     {
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/Microsoft.AspNet.Identity.EntityFramework.Test.kproj b/test/Microsoft.AspNet.Identity.SqlServer.Test/Microsoft.AspNet.Identity.SqlServer.Test.kproj
similarity index 100%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/Microsoft.AspNet.Identity.EntityFramework.Test.kproj
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/Microsoft.AspNet.Identity.SqlServer.Test.kproj
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
index 8f08ba9feb..636014a096 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
@@ -13,7 +13,7 @@ using System.Security.Claims;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
 
     public abstract class SqlStoreTestBase<TUser, TRole, TKey> : UserManagerTestBase<TUser, TRole, TKey>
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreGuidKeyTest.cs
similarity index 95%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreGuidKeyTest.cs
index 832bfa981d..0e2ff36f06 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreGuidKeyTest.cs
@@ -7,7 +7,7 @@ using Microsoft.Framework.DependencyInjection.Fallback;
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
     public class GuidUser : IdentityUser<Guid>
     {
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
         }
     }
 
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
     public class UserStoreGuidTest : SqlStoreTestBase<GuidUser, GuidRole, Guid>
     {
         public override string ConnectionString
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreIntKeyTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreIntKeyTest.cs
similarity index 90%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreIntKeyTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreIntKeyTest.cs
index e1e357bb08..ae1272e02d 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreIntKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreIntKeyTest.cs
@@ -9,7 +9,7 @@ using Microsoft.Framework.OptionsModel;
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
     public class IntUser : IdentityUser<int>
     {
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
         }
     }
 
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
     public class UserStoreIntTest : SqlStoreTestBase<IntUser, IntRole, int>
     {
         public override string ConnectionString
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreStringKeyTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreStringKeyTest.cs
similarity index 85%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreStringKeyTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreStringKeyTest.cs
index b329f0b71d..5ff81a367b 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreStringKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreStringKeyTest.cs
@@ -4,9 +4,9 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
     public class StringUser : IdentityUser
     {
         public StringUser()
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
         }
     }
 
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
     public class UserStoreStringKeyTest : SqlStoreTestBase<StringUser, StringRole, string>
     {
         public override string ConnectionString
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
index de86970732..aceefaaabd 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
@@ -16,9 +16,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.EntityFramework.Test
+namespace Microsoft.AspNet.Identity.SqlServer.Test
 {
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
     public class UserStoreTest : UserManagerTestBase<IdentityUser, IdentityRole>
     {
         private const string ConnectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreTest;Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json b/test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
similarity index 93%
rename from test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
rename to test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
index 7bc6e996a8..1cdca48611 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Identity": "",
-    "Microsoft.AspNet.Identity.EntityFramework": "",
+    "Microsoft.AspNet.Identity.SqlServer": "",
     "Microsoft.AspNet.PipelineCore": "1.0.0-*",
     "Microsoft.AspNet.RequestContainer": "1.0.0-*",
     "Microsoft.AspNet.Security.DataProtection": "1.0.0-*",