Fix dependency issues

samples/CookieSample/Startup.cs

@@ -2,12 +2,12 @@ using System;
 using System.Security.Claims;
 using Microsoft.AspNet;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.DependencyInjection;
-using Microsoft.AspNet.DependencyInjection.Fallback;
-using Microsoft.AspNet.Logging;
 using Microsoft.AspNet.Security.Cookies;
 using Microsoft.AspNet.RequestContainer;
 using Microsoft.AspNet.Builder;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
+using Microsoft.Framework.Logging;
 
 namespace CookieSample
 {
@@ -43,7 +43,7 @@ namespace CookieSample
         }
 
         // TODO: Temp workaround until the host reliably provides logging.
-        // If ILoggerFactory is never guaranteed, move this fallback into Microsoft.AspNet.Logging.
+        // If ILoggerFactory is never guaranteed, move this fallback into Microsoft.Framework.Logging.
         private class NullLoggerFactory : ILoggerFactory
         {
             public ILogger Create(string name)

samples/CookieSample/project.json

@@ -2,7 +2,6 @@
   "version": "0.1-alpha-*",
   "dependencies": {
     "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Security": "",
     "Microsoft.AspNet.Security.Cookies": "",
     "Microsoft.AspNet.Hosting": "0.1-alpha-*",
@@ -10,8 +9,9 @@
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
     "Microsoft.AspNet.FeatureModel": "0.1-alpha-*",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Logging": "0.1-alpha-*",
+    "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
-    "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*"
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
+    "Microsoft.Framework.Logging": "0.1-alpha-*"
   },
   "commands": { "web": "Microsoft.AspNet.Hosting server.name=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:12345" },
   "configurations": {

src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationExtensions.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Logging;
 using Microsoft.AspNet.Security.Cookies;
 using Microsoft.AspNet.Security.DataProtection;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.Logging;
 
 namespace Microsoft.AspNet.Builder
 {

src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationHandler.cs

@@ -3,8 +3,8 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Logging;
 using Microsoft.AspNet.Security.Infrastructure;
+using Microsoft.Framework.Logging;
 
 namespace Microsoft.AspNet.Security.Cookies
 {

src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationMiddleware.cs

@@ -3,10 +3,10 @@
 using System;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Logging;
 using Microsoft.AspNet.Security.DataHandler;
 using Microsoft.AspNet.Security.DataProtection;
 using Microsoft.AspNet.Security.Infrastructure;
+using Microsoft.Framework.Logging;
 
 namespace Microsoft.AspNet.Security.Cookies
 {

src/Microsoft.AspNet.Security.Cookies/project.json

@@ -3,13 +3,13 @@
   "dependencies": {
     "Newtonsoft.Json": "5.0.8",
     "Microsoft.AspNet.Security": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.FeatureModel": "0.1-alpha-*",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Logging": "0.1-alpha-*",
+    "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*",
-    "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*"
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
+    "Microsoft.Framework.Logging": "0.1-alpha-*"
   },
   "configurations": {
     "net45": {},

src/Microsoft.AspNet.Security/Infrastructure/AuthenticationHandler.cs

@@ -11,8 +11,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Security;
 using Microsoft.AspNet.HttpFeature.Security;
-using Microsoft.AspNet.Logging;
 using Microsoft.AspNet.Security.DataHandler.Encoder;
+using Microsoft.Framework.Logging;
 
 namespace Microsoft.AspNet.Security.Infrastructure
 {

src/Microsoft.AspNet.Security/project.json

@@ -1,13 +1,13 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.FeatureModel": "0.1-alpha-*",
     "Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
-    "Microsoft.AspNet.Logging": "0.1-alpha-*",
+    "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*",
-    "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*"
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
+    "Microsoft.Framework.Logging": "0.1-alpha-*"
   },
   "configurations": {
     "net45": {},