Rename OpenIddict.EntityFramework to OpenIddict.EntityFrameworkCore

OpenIddict.sln

@@ -13,7 +13,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mvc.Client", "samples\Mvc.C
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Mvc.Server", "samples\Mvc.Server\Mvc.Server.xproj", "{7CBEAFD2-E3D0-4424-9B78-E87AB52327A6}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.EntityFramework", "src\OpenIddict.EntityFramework\OpenIddict.EntityFramework.xproj", "{D2450929-ED0E-420D-B475-327924F9701C}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.EntityFrameworkCore", "src\OpenIddict.EntityFrameworkCore\OpenIddict.EntityFrameworkCore.xproj", "{D2450929-ED0E-420D-B475-327924F9701C}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Core", "src\OpenIddict.Core\OpenIddict.Core.xproj", "{E60CF8CA-6313-4359-BE43-AFCBB927EA30}"
 EndProject
@@ -23,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5FC71D6A-A
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Core.Tests", "test\OpenIddict.Core.Tests\OpenIddict.Core.Tests.xproj", "{A892B3DE-1A02-48D6-993B-DD3DFCAC84C7}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.EntityFramework.Tests", "test\OpenIddict.EntityFramework.Tests\OpenIddict.EntityFramework.Tests.xproj", "{7831F17A-DF0B-42EC-841B-065A9B5BD786}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.EntityFrameworkCore.Tests", "test\OpenIddict.EntityFrameworkCore.Tests\OpenIddict.EntityFrameworkCore.Tests.xproj", "{7831F17A-DF0B-42EC-841B-065A9B5BD786}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Mvc.Tests", "test\OpenIddict.Mvc.Tests\OpenIddict.Mvc.Tests.xproj", "{8B4B0CCC-711B-4F9D-9DE6-DD32BDD3BCCA}"
 EndProject

samples/Mvc.Server/Startup.cs

@@ -32,7 +32,7 @@ namespace Mvc.Server {
             // Register the OpenIddict services.
             services.AddOpenIddict()
                 // Register the Entity Framework stores.
-                .AddEntityFrameworkStores<ApplicationDbContext>()
+                .AddEntityFrameworkCoreStores<ApplicationDbContext>()
 
                 // Register the ASP.NET Core MVC binder used by OpenIddict.
                 // Note: if you don't call this method, you won't be able to

samples/Mvc.Server/project.json

@@ -37,7 +37,7 @@
     "Microsoft.Extensions.Logging.Debug": "1.0.0",
     "NWebsec.AspNetCore.Middleware": "1.0.0-gamma1-15",
     "OpenIddict": { "target": "project" },
-    "OpenIddict.EntityFramework": { "target": "project" },
+    "OpenIddict.EntityFrameworkCore": { "target": "project" },
     "OpenIddict.Mvc": { "target": "project" }
   },
 

src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.xproj → src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.xproj

@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>d2450929-ed0e-420d-b475-327924f9701c</ProjectGuid>
-    <RootNamespace>OpenIddict.EntityFramework</RootNamespace>
+    <RootNamespace>OpenIddict.EntityFrameworkCore</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>

src/OpenIddict.EntityFramework/OpenIddictCustomizer.cs → src/OpenIddict.EntityFrameworkCore/OpenIddictCustomizer.cs

@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using OpenIddict.Models;
 
-namespace OpenIddict.EntityFramework {
+namespace OpenIddict.EntityFrameworkCore {
     /// <summary>
     /// Represents a model customizer able to register the entity sets
     /// required by the OpenIddict stack in an Entity Framework context.

src/OpenIddict.EntityFramework/OpenIddictExtension.cs → src/OpenIddict.EntityFrameworkCore/OpenIddictExtension.cs

@@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using OpenIddict.Models;
 
-namespace OpenIddict.EntityFramework {
+namespace OpenIddict.EntityFrameworkCore {
     public class OpenIddictExtension<TApplication, TAuthorization, TScope, TToken, TKey> : IDbContextOptionsExtension
         where TApplication : OpenIddictApplication<TKey, TToken>
         where TAuthorization : OpenIddictAuthorization<TKey, TToken>

src/OpenIddict.EntityFramework/OpenIddictExtensions.cs → src/OpenIddict.EntityFrameworkCore/OpenIddictExtensions.cs

@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OpenIddict.Core;
-using OpenIddict.EntityFramework;
+using OpenIddict.EntityFrameworkCore;
 using OpenIddict.Models;
 
 namespace Microsoft.Extensions.DependencyInjection {
@@ -22,9 +22,9 @@ namespace Microsoft.Extensions.DependencyInjection {
         /// </summary>
         /// <param name="builder">The services builder used by OpenIddict to register new services.</param>
         /// <returns>The <see cref="OpenIddictBuilder"/>.</returns>
-        public static OpenIddictBuilder AddEntityFrameworkStores<TContext>([NotNull] this OpenIddictBuilder builder)
+        public static OpenIddictBuilder AddEntityFrameworkCoreStores<TContext>([NotNull] this OpenIddictBuilder builder)
             where TContext : DbContext {
-            return builder.AddEntityFrameworkStores<TContext, string>();
+            return builder.AddEntityFrameworkCoreStores<TContext, string>();
         }
 
         /// <summary>
@@ -33,7 +33,7 @@ namespace Microsoft.Extensions.DependencyInjection {
         /// </summary>
         /// <param name="builder">The services builder used by OpenIddict to register new services.</param>
         /// <returns>The <see cref="OpenIddictBuilder"/>.</returns>
-        public static OpenIddictBuilder AddEntityFrameworkStores<TContext, TKey>([NotNull] this OpenIddictBuilder builder)
+        public static OpenIddictBuilder AddEntityFrameworkCoreStores<TContext, TKey>([NotNull] this OpenIddictBuilder builder)
             where TContext : DbContext
             where TKey : IEquatable<TKey> {
             if (builder == null) {

src/OpenIddict.EntityFramework/Stores/OpenIddictApplicationStore.cs → src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictApplicationStore.cs

@@ -15,7 +15,7 @@ using Microsoft.EntityFrameworkCore;
 using OpenIddict.Core;
 using OpenIddict.Models;
 
-namespace OpenIddict.EntityFramework {
+namespace OpenIddict.EntityFrameworkCore {
     /// <summary>
     /// Provides methods allowing to manage the applications stored in a database.
     /// </summary>

src/OpenIddict.EntityFramework/Stores/OpenIddictAuthorizationStore.cs → src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictAuthorizationStore.cs

@@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore;
 using OpenIddict.Core;
 using OpenIddict.Models;
 
-namespace OpenIddict.EntityFramework {
+namespace OpenIddict.EntityFrameworkCore {
     /// <summary>
     /// Provides methods allowing to manage the authorizations stored in a database.
     /// </summary>

src/OpenIddict.EntityFramework/Stores/OpenIddictScopeStore.cs → src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictScopeStore.cs

@@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore;
 using OpenIddict.Core;
 using OpenIddict.Models;
 
-namespace OpenIddict.EntityFramework {
+namespace OpenIddict.EntityFrameworkCore {
     /// <summary>
     /// Provides methods allowing to manage the scopes stored in a database.
     /// </summary>

src/OpenIddict.EntityFramework/Stores/OpenIddictTokenStore.cs → src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictTokenStore.cs

@@ -13,7 +13,7 @@ using Microsoft.EntityFrameworkCore;
 using OpenIddict.Core;
 using OpenIddict.Models;
 
-namespace OpenIddict.EntityFramework {
+namespace OpenIddict.EntityFrameworkCore {
     /// <summary>
     /// Provides methods allowing to manage the tokens stored in a database.
     /// </summary>

src/OpenIddict.EntityFramework/project.json → src/OpenIddict.EntityFrameworkCore/project.json

@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-beta2-*",
 
-  "description": "Entity Framework adapter for OpenIddict.",
+  "description": "Entity Framework Core stores for OpenIddict.",
   "authors": [ "Kévin Chalet" ],
 
   "packOptions": {
@@ -41,13 +41,13 @@
   "frameworks": {
     "net451": { },
 
-    "netstandard1.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.ComponentModel.TypeConverter": "4.1.0"
       },
 
       "imports": [
-        "dotnet5.5",
+        "dotnet5.4",
         "portable-net451+win8"
       ]
     }

test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.xproj → test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.xproj

@@ -8,7 +8,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>7831f17a-df0b-42ec-841b-065a9b5bd786</ProjectGuid>
-    <RootNamespace>OpenIddict.EntityFramework.Tests</RootNamespace>
+    <RootNamespace>OpenIddict.EntityFrameworkCore.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -18,4 +18,4 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

test/OpenIddict.EntityFramework.Tests/OpenIddictExtensionsTests.cs → test/OpenIddict.EntityFrameworkCore.Tests/OpenIddictExtensionsTests.cs

@@ -4,20 +4,20 @@ using Microsoft.Extensions.DependencyInjection;
 using OpenIddict.Models;
 using Xunit;
 
-namespace OpenIddict.EntityFramework.Tests {
+namespace OpenIddict.EntityFrameworkCore.Tests {
     public class OpenIddictExtensionsTests {
         [Theory]
         [InlineData(typeof(OpenIddictApplicationStore<OpenIddictApplication<Guid, OpenIddictToken<Guid>>, OpenIddictToken<Guid>, DbContext, Guid>))]
         [InlineData(typeof(OpenIddictAuthorizationStore<OpenIddictAuthorization<Guid, OpenIddictToken<Guid>>, OpenIddictToken<Guid>, DbContext, Guid>))]
         [InlineData(typeof(OpenIddictScopeStore<OpenIddictScope<Guid>, DbContext, Guid>))]
         [InlineData(typeof(OpenIddictTokenStore<OpenIddictToken<Guid>, OpenIddictAuthorization<Guid, OpenIddictToken<Guid>>, DbContext, Guid>))]
-        public void AddEntityFrameworkStores_RegistersEntityFrameworkStores(Type type) {
+        public void AddEntityFrameworkCoreStores_RegistersEntityFrameworkStores(Type type) {
             // Arrange
             var services = new ServiceCollection();
 
             // Act
             services.AddOpenIddict<Guid>()
-                .AddEntityFrameworkStores<DbContext, Guid>();
+                .AddEntityFrameworkCoreStores<DbContext, Guid>();
 
             // Assert
             Assert.Contains(services, service => service.ImplementationType == type);
@@ -28,13 +28,13 @@ namespace OpenIddict.EntityFramework.Tests {
         [InlineData(typeof(OpenIddictAuthorizationStore<OpenIddictAuthorization, OpenIddictToken, DbContext, string>))]
         [InlineData(typeof(OpenIddictScopeStore<OpenIddictScope, DbContext, string>))]
         [InlineData(typeof(OpenIddictTokenStore<OpenIddictToken, OpenIddictAuthorization, DbContext, string>))]
-        public void AddEntityFrameworkStores_KeyTypeDefaultsToString(Type type) {
+        public void AddEntityFrameworkCoreStores_KeyTypeDefaultsToString(Type type) {
             // Arrange
             var services = new ServiceCollection();
 
             // Act
             services.AddOpenIddict()
-                .AddEntityFrameworkStores<DbContext>();
+                .AddEntityFrameworkCoreStores<DbContext>();
 
             // Assert
             Assert.Contains(services, service => service.ImplementationType == type);

test/OpenIddict.EntityFramework.Tests/project.json → test/OpenIddict.EntityFrameworkCore.Tests/project.json

@@ -7,7 +7,7 @@
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Microsoft.AspNetCore.TestHost": "1.0.0",
     "Moq": "4.6.38-alpha",
-    "OpenIddict.EntityFramework": { "target": "project" },
+    "OpenIddict.EntityFrameworkCore": { "target": "project" },
     "xunit": "2.2.0-beta2-build3300"
   },