Fix dependency issues

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
 {

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;

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-*",

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
 {

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": {

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;

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" : "",

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
 {

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

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
     {

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;
 

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
 {

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
 {

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-*"

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;

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;

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;

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;

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-*",

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

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;

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-*",

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;

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-*",

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;
 

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

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

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

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;

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

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-*",

test/Shared/IdentityConfig.cs

@@ -1,5 +1,5 @@
 using System;
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Identity.Test
 {

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

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;