renamed EntityFrameworkCore project to EntityFramework

AbpCoreEf6Sample/aspnet-core/AbpCoreEf6Sample.sln

@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCoreEf6Sample.Web.Core",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCoreEf6Sample.Web.Mvc", "src\AbpCoreEf6Sample.Web.Mvc\AbpCoreEf6Sample.Web.Mvc.csproj", "{A2213374-BB48-48FD-BBD4-81E6A961D866}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCoreEf6Sample.EntityFrameworkCore", "src\AbpCoreEf6Sample.EntityFrameworkCore\AbpCoreEf6Sample.EntityFrameworkCore.csproj", "{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCoreEf6Sample.EntityFramework", "src\AbpCoreEf6Sample.EntityFramework\AbpCoreEf6Sample.EntityFramework.csproj", "{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpCoreEf6Sample.Web.Tests", "test\AbpCoreEf6Sample.Web.Tests\AbpCoreEf6Sample.Web.Tests.csproj", "{CA86CF6F-5D9E-4DAC-9CCB-0F87B519E087}"
 EndProject

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/AbpCoreEf6Sample.EntityFramework.csproj

@@ -6,6 +6,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <AssemblyName>AbpCoreEf6Sample.EntityFramework</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Migrations\20180726102624_Upgrade_ABP_380.cs" />
@@ -18,4 +19,7 @@
   <ItemGroup>
     <ProjectReference Include="..\AbpCoreEf6Sample.Core\AbpCoreEf6Sample.Core.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Migrations" />
+  </ItemGroup>
 </Project>

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/AbpCoreEf6SampleDbContextConfiguration.cs

@@ -1,9 +1,9 @@
 using Abp.MultiTenancy;
 using Abp.Zero.EntityFramework;
-using AbpCoreEf6Sample.EntityFrameworkCore;
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed;
 using EntityFramework.DynamicFilters;
 using System.Data.Entity.Migrations;
+using AbpCoreEf6Sample.EntityFramework;
+using AbpCoreEf6Sample.EntityFramework.Seed;
 
 namespace AbpCoreEf6Sample
 {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/AbpCoreEf6SampleDbContext.cs

@@ -6,7 +6,7 @@ using AbpCoreEf6Sample.Authorization.Roles;
 using AbpCoreEf6Sample.Authorization.Users;
 using AbpCoreEf6Sample.MultiTenancy;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore
+namespace AbpCoreEf6Sample.EntityFramework
 {
     public class AbpCoreEf6SampleDbContext : AbpZeroDbContext<Tenant, Role, User, AbpCoreEf6SampleDbContext>
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/AbpCoreEf6SampleEntityFrameworkModule.cs

@@ -1,9 +1,9 @@
-using Abp.Modules;
+using System.Data.Entity;
+using Abp.Modules;
 using Abp.Reflection.Extensions;
 using Abp.Zero.EntityFramework;
-using System.Data.Entity;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore
+namespace AbpCoreEf6Sample.EntityFramework
 {
     [DependsOn(
         typeof(AbpCoreEf6SampleCoreModule), 

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/AbpZeroDbMigrator.cs

@@ -3,7 +3,7 @@ using Abp.Domain.Uow;
 using Abp.MultiTenancy;
 using Abp.Zero.EntityFramework;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore
+namespace AbpCoreEf6Sample.EntityFramework
 {
     public class AbpZeroDbMigrator : AbpZeroDbMigrator<AbpCoreEf6SampleDbContext, AbpCoreEf6SampleDbContextConfiguration>
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Repositories/AbpCoreEf6SampleRepositoryBase.cs

@@ -3,7 +3,7 @@ using Abp.Domain.Repositories;
 using Abp.EntityFramework;
 using Abp.EntityFramework.Repositories;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Repositories
+namespace AbpCoreEf6Sample.EntityFramework.Repositories
 {
     /// <summary>
     /// Base class for custom repositories of the application.

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Host/DefaultEditionCreator.cs

@@ -1,10 +1,9 @@
 using System.Linq;
-using System.Data.Entity;
 using Abp.Application.Editions;
 using Abp.Application.Features;
 using AbpCoreEf6Sample.Editions;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Host
 {
     public class DefaultEditionCreator
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Host/DefaultLanguagesCreator.cs

@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Data.Entity;
 using Abp.Localization;
 using Abp.MultiTenancy;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Host
 {
     public class DefaultLanguagesCreator
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Host/DefaultSettingsCreator.cs

@@ -1,11 +1,10 @@
 using System.Linq;
-using System.Data.Entity;
 using Abp.Configuration;
 using Abp.Localization;
 using Abp.MultiTenancy;
 using Abp.Net.Mail;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Host
 {
     public class DefaultSettingsCreator
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Host/HostRoleAndUserCreator.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Data.Entity;
 using Abp.Authorization;
 using Abp.Authorization.Roles;
 using Abp.Authorization.Users;
@@ -10,7 +9,7 @@ using AbpCoreEf6Sample.Authorization.Users;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Host
 {
     public class HostRoleAndUserCreator
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Host/InitialHostDbBuilder.cs

@@ -1,4 +1,4 @@
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Host
 {
     public class InitialHostDbBuilder
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/SeedHelper.cs

@@ -1,7 +1,7 @@
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host;
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed.Tenants;
+using AbpCoreEf6Sample.EntityFramework.Seed.Host;
+using AbpCoreEf6Sample.EntityFramework.Seed.Tenants;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed
+namespace AbpCoreEf6Sample.EntityFramework.Seed
 {
     public static class SeedHelper
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Tenants/DefaultTenantBuilder.cs

@@ -1,10 +1,9 @@
 using System.Linq;
-using System.Data.Entity;
 using Abp.MultiTenancy;
 using AbpCoreEf6Sample.Editions;
 using AbpCoreEf6Sample.MultiTenancy;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Tenants
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Tenants
 {
     public class DefaultTenantBuilder
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/EntityFramework/Seed/Tenants/TenantRoleAndUserBuilder.cs

@@ -1,7 +1,4 @@
 using System.Linq;
-using Microsoft.AspNetCore.Identity;
-using System.Data.Entity;
-using Microsoft.Extensions.Options;
 using Abp.Authorization;
 using Abp.Authorization.Roles;
 using Abp.Authorization.Users;
@@ -9,8 +6,10 @@ using Abp.MultiTenancy;
 using AbpCoreEf6Sample.Authorization;
 using AbpCoreEf6Sample.Authorization.Roles;
 using AbpCoreEf6Sample.Authorization.Users;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Options;
 
-namespace AbpCoreEf6Sample.EntityFrameworkCore.Seed.Tenants
+namespace AbpCoreEf6Sample.EntityFramework.Seed.Tenants
 {
     public class TenantRoleAndUserBuilder
     {

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.EntityFramework/Migrations/202102261154101_EF6Initialize.Designer.cs

@@ -13,7 +13,7 @@ namespace AbpCoreEf6Sample
         
         string IMigrationMetadata.Id
         {
-            get { return "202102251308360_EF6Initialize"; }
+            get { return "202102261154101_EF6Initialize"; }
         }
         
         string IMigrationMetadata.Source

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.Migrator/AbpCoreEf6Sample.Migrator.csproj

@@ -19,6 +19,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AbpCoreEf6Sample.Core\AbpCoreEf6Sample.Core.csproj" />
-    <ProjectReference Include="..\AbpCoreEf6Sample.EntityFrameworkCore\AbpCoreEf6Sample.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\AbpCoreEf6Sample.EntityFramework\AbpCoreEf6Sample.EntityFramework.csproj" />
   </ItemGroup>
 </Project>

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.Migrator/AbpCoreEf6SampleMigratorModule.cs

@@ -4,7 +4,7 @@ using Abp.Events.Bus;
 using Abp.Modules;
 using Abp.Reflection.Extensions;
 using AbpCoreEf6Sample.Configuration;
-using AbpCoreEf6Sample.EntityFrameworkCore;
+using AbpCoreEf6Sample.EntityFramework;
 using AbpCoreEf6Sample.Migrator.DependencyInjection;
 
 namespace AbpCoreEf6Sample.Migrator

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.Migrator/MultiTenantMigrateExecuter.cs

@@ -8,8 +8,7 @@ using Abp.Domain.Uow;
 using Abp.Extensions;
 using Abp.MultiTenancy;
 using Abp.Runtime.Security;
-using AbpCoreEf6Sample.EntityFrameworkCore;
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed;
+using AbpCoreEf6Sample.EntityFramework;
 using AbpCoreEf6Sample.MultiTenancy;
 
 namespace AbpCoreEf6Sample.Migrator

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.Web.Core/AbpCoreEf6Sample.Web.Core.csproj

@@ -19,7 +19,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\AbpCoreEf6Sample.Application\AbpCoreEf6Sample.Application.csproj" />
-    <ProjectReference Include="..\AbpCoreEf6Sample.EntityFrameworkCore\AbpCoreEf6Sample.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\AbpCoreEf6Sample.EntityFramework\AbpCoreEf6Sample.EntityFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />

AbpCoreEf6Sample/aspnet-core/src/AbpCoreEf6Sample.Web.Core/AbpCoreEf6SampleWebCoreModule.cs

@@ -11,7 +11,7 @@ using Abp.Reflection.Extensions;
 using Abp.Zero.Configuration;
 using AbpCoreEf6Sample.Authentication.JwtBearer;
 using AbpCoreEf6Sample.Configuration;
-using AbpCoreEf6Sample.EntityFrameworkCore;
+using AbpCoreEf6Sample.EntityFramework;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 
 namespace AbpCoreEf6Sample

AbpCoreEf6Sample/aspnet-core/test/AbpCoreEf6Sample.Tests/AbpCoreEf6Sample.Tests.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\AbpCoreEf6Sample.Application\AbpCoreEf6Sample.Application.csproj" />
-    <ProjectReference Include="..\..\src\AbpCoreEf6Sample.EntityFrameworkCore\AbpCoreEf6Sample.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\AbpCoreEf6Sample.EntityFramework\AbpCoreEf6Sample.EntityFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Effort.EF6" Version="2.2.12" />

AbpCoreEf6Sample/aspnet-core/test/AbpCoreEf6Sample.Tests/AbpCoreEf6SampleTestBase.cs

@@ -10,9 +10,9 @@ using Abp.MultiTenancy;
 using Abp.Runtime.Session;
 using Abp.TestBase;
 using AbpCoreEf6Sample.Authorization.Users;
-using AbpCoreEf6Sample.EntityFrameworkCore;
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed.Host;
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed.Tenants;
+using AbpCoreEf6Sample.EntityFramework;
+using AbpCoreEf6Sample.EntityFramework.Seed.Host;
+using AbpCoreEf6Sample.EntityFramework.Seed.Tenants;
 using AbpCoreEf6Sample.MultiTenancy;
 
 namespace AbpCoreEf6Sample.Tests

AbpCoreEf6Sample/aspnet-core/test/AbpCoreEf6Sample.Tests/AbpCoreEf6SampleTestModule.cs

@@ -9,7 +9,7 @@ using Abp.Net.Mail;
 using Abp.TestBase;
 using Abp.Zero.Configuration;
 using Abp.Zero.EntityFramework;
-using AbpCoreEf6Sample.EntityFrameworkCore;
+using AbpCoreEf6Sample.EntityFramework;
 using AbpCoreEf6Sample.Tests.DependencyInjection;
 
 namespace AbpCoreEf6Sample.Tests

AbpCoreEf6Sample/aspnet-core/test/AbpCoreEf6Sample.Web.Tests/AbpCoreEf6SampleWebTestBase.cs

@@ -11,8 +11,8 @@ using Abp.Extensions;
 using Abp.Json;
 using Abp.MultiTenancy;
 using Abp.Web.Models;
-using AbpCoreEf6Sample.EntityFrameworkCore;
-using AbpCoreEf6Sample.EntityFrameworkCore.Seed;
+using AbpCoreEf6Sample.EntityFramework;
+using AbpCoreEf6Sample.EntityFramework.Seed;
 using AbpCoreEf6Sample.Models.TokenAuth;
 using AbpCoreEf6Sample.Web.Startup;
 using AngleSharp.Html.Dom;

AbpCoreEf6Sample/aspnet-core/test/AbpCoreEf6Sample.Web.Tests/AbpCoreEf6SampleWebTestModule.cs

@@ -2,7 +2,7 @@
 using Abp.AspNetCore.TestBase;
 using Abp.Modules;
 using Abp.Reflection.Extensions;
-using AbpCoreEf6Sample.EntityFrameworkCore;
+using AbpCoreEf6Sample.EntityFramework;
 using AbpCoreEf6Sample.Web.Startup;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;