From 199eb5d416f76775cafc95e6236d2269c39e1b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Thu, 8 Oct 2015 21:51:08 +0200 Subject: [PATCH] React to namespace changes in ASP.NET 5 RC1 --- samples/Mvc.Client/Startup.cs | 4 ++-- samples/Mvc.Client/project.json | 2 +- samples/Mvc.Server/Startup.cs | 6 +++--- samples/Mvc.Server/project.json | 2 +- src/OpenIddict.Models/project.json | 13 +++++-------- src/OpenIddict/OpenIddictController.cs | 4 ++-- src/OpenIddict/OpenIddictExtensions.cs | 4 ++-- src/OpenIddict/OpenIddictProvider.cs | 4 ++-- src/OpenIddict/project.json | 4 ++-- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/samples/Mvc.Client/Startup.cs b/samples/Mvc.Client/Startup.cs index b379e3fa..d5fa627d 100644 --- a/samples/Mvc.Client/Startup.cs +++ b/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; diff --git a/samples/Mvc.Client/project.json b/samples/Mvc.Client/project.json index 676c7ba4..87278457 100644 --- a/samples/Mvc.Client/project.json +++ b/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" }, diff --git a/samples/Mvc.Server/Startup.cs b/samples/Mvc.Server/Startup.cs index 960f341b..d00e669d 100644 --- a/samples/Mvc.Server/Startup.cs +++ b/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; diff --git a/samples/Mvc.Server/project.json b/samples/Mvc.Server/project.json index 9cc0c42b..8a53be4f 100644 --- a/samples/Mvc.Server/project.json +++ b/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-*" }, diff --git a/src/OpenIddict.Models/project.json b/src/OpenIddict.Models/project.json index dfb9cc6b..70975b62 100644 --- a/src/OpenIddict.Models/project.json +++ b/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-*" + } + } } } \ No newline at end of file diff --git a/src/OpenIddict/OpenIddictController.cs b/src/OpenIddict/OpenIddictController.cs index 0528bf3a..c0d1d696 100644 --- a/src/OpenIddict/OpenIddictController.cs +++ b/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 { diff --git a/src/OpenIddict/OpenIddictExtensions.cs b/src/OpenIddict/OpenIddictExtensions.cs index 69ceb723..c1285db1 100644 --- a/src/OpenIddict/OpenIddictExtensions.cs +++ b/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 diff --git a/src/OpenIddict/OpenIddictProvider.cs b/src/OpenIddict/OpenIddictProvider.cs index 50ac8f5a..bda9325c 100644 --- a/src/OpenIddict/OpenIddictProvider.cs +++ b/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 { diff --git a/src/OpenIddict/project.json b/src/OpenIddict/project.json index baf8e185..10847169 100644 --- a/src/OpenIddict/project.json +++ b/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-*" },