React to namespace changes in ASP.NET 5 RC1

samples/Mvc.Client/Startup.cs

@@ -4,8 +4,8 @@ using Microsoft.AspNet.Authentication.Cookies;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Protocols;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 

samples/Mvc.Client/project.json

@@ -13,7 +13,7 @@
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
         "Microsoft.AspNet.StaticFiles": "1.0.0-*",
 
-        "Microsoft.Framework.Logging.Console": "1.0.0-*",
+        "Microsoft.Extensions.Logging.Console": "1.0.0-*",
 
         "Newtonsoft.Json": "7.0.1"
     },

samples/Mvc.Server/Startup.cs

@@ -3,9 +3,9 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Protocols;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Mvc.Server.Models;

samples/Mvc.Server/project.json

@@ -13,7 +13,7 @@
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
         "Microsoft.AspNet.StaticFiles": "1.0.0-*",
 
-        "Microsoft.Framework.Logging.Console": "1.0.0-*",
+        "Microsoft.Extensions.Logging.Console": "1.0.0-*",
 
         "OpenIddict": "1.0.0-*"
     },

src/OpenIddict.Models/project.json

@@ -1,15 +1,12 @@
 {
     "version": "1.0.0-alpha1-*",
 
-    "dependencies": {
-        "Microsoft.Framework.NotNullAttribute.Sources": {
-            "type": "build",
-            "version": "1.0.0-*"
-        }
-    },
-
     "frameworks": {
         "dnx451": { },
-        "dnxcore50": { }
+        "dnxcore50": {
+            "dependencies": {
+                "System.Runtime": "4.0.21-*"
+            }
+        }
     }
 }

src/OpenIddict/OpenIddictController.cs

@@ -17,8 +17,8 @@ using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Data.Entity;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 
 namespace OpenIddict {

src/OpenIddict/OpenIddictExtensions.cs

@@ -13,8 +13,8 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.AspNet.StaticFiles;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
 using OpenIddict;
 
 #if DNX451

src/OpenIddict/OpenIddictProvider.cs

@@ -15,8 +15,8 @@ using AspNet.Security.OpenIdConnect.Server;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
 using OpenIddict.Models;
 
 namespace OpenIddict {

src/OpenIddict/project.json

@@ -10,9 +10,9 @@
         "Microsoft.AspNet.Mvc": "6.0.0-*",
         "Microsoft.AspNet.StaticFiles": "1.0.0-*",
 
-        "Microsoft.Framework.Configuration.Json": "1.0.0-*",
+        "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
 
-        "Microsoft.Framework.NotNullAttribute.Sources": {
+        "Microsoft.Extensions.NotNullAttribute.Sources": {
             "type": "build",
             "version": "1.0.0-*"
         },