✨ 删除DbMigrations模块

aspnet-core/CompanyName.ProjectName.sln

@@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Application.Tests", "services\test\CompanyName.ProjectName.Application.Tests\CompanyName.ProjectName.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.EntityFrameworkCore.DbMigrations", "services\src\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Domain.Shared", "services\src\CompanyName.ProjectName.Domain.Shared\CompanyName.ProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Application.Contracts", "services\src\CompanyName.ProjectName.Application.Contracts\CompanyName.ProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
@@ -169,10 +167,6 @@ Global
 		{50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -352,7 +346,6 @@ Global
 		{CA9AC87F-097E-4F15-8393-4BC07735A5B0} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683}
 		{04DBDB01-70F4-4E06-B468-8F87850B22BE} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683}
 		{50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}

aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj

@@ -15,7 +15,6 @@
     <PackageReference Include="IdentityModel" Version="5.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpPackageVersion)" />

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj

@@ -39,7 +39,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\frameworks\CAP\src\Lion.Abp.Cap\Lion.Abp.Cap.csproj" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.Application\CompanyName.ProjectName.Application.csproj" />
-    <ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.HttpApi\CompanyName.ProjectName.HttpApi.csproj" />
   </ItemGroup>
 

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs

@@ -52,7 +52,7 @@ namespace CompanyName.ProjectName
         typeof(AbpCachingStackExchangeRedisModule),
         typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
         typeof(ProjectNameApplicationModule),
-        typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule),
+        typeof(ProjectNameEntityFrameworkCoreModule),
         typeof(AbpAspNetCoreSerilogModule),
         typeof(AbpSwashbuckleModule),
         typeof(AbpAccountWebModule),

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json

@@ -15,7 +15,7 @@
     "CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,http://localhost:3100"
   },
   "ConnectionStrings": {
-    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
+    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
   },
   "Redis": {
     "Configuration": "localhost,password=mypassword,defaultdatabase=1"

aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj

@@ -45,7 +45,7 @@
     <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpPackageVersion)" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.Domain.Shared\CompanyName.ProjectName.Domain.Shared.csproj" />
-    <ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>

aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/ProjectNameIdentityServerModule.cs

@@ -45,7 +45,7 @@ namespace CompanyName.ProjectName
         typeof(AbpAccountWebIdentityServerModule),
         typeof(AbpAccountApplicationModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-        typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule),
+        typeof(ProjectNameEntityFrameworkCoreModule),
         typeof(AbpAspNetCoreSerilogModule)
     )]
     public class ProjectNameIdentityServerModule : AbpModule

aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json

@@ -6,7 +6,7 @@
     "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
   },
   "ConnectionStrings": {
-    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
+    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
   },
   "Redis": {
     "Configuration": "localhost,password=mypassword,defaultdatabase=1"

aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/CompanyName.ProjectName.DbMigrator.csproj

@@ -28,7 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpPackageVersion)" />
     <ProjectReference Include="..\CompanyName.ProjectName.Application.Contracts\CompanyName.ProjectName.Application.Contracts.csproj" />
-    <ProjectReference Include="..\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
   </ItemGroup>
   
   <ItemGroup>

aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/ProjectNameDbMigratorModule.cs

@@ -7,7 +7,7 @@ namespace CompanyName.ProjectName.DbMigrator
 {
     [DependsOn(
         typeof(AbpAutofacModule),
-        typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule),
+        typeof(ProjectNameEntityFrameworkCoreModule),
         typeof(ProjectNameApplicationContractsModule)
         )]
     public class ProjectNameDbMigratorModule : AbpModule

aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json

@@ -1,5 +1,5 @@
 {
   "ConnectionStrings": {
-    "Default": "Data Source=120.24.194.14;Database=CompanyNameProjectNameDB1;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
+    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
   }
 }

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>CompanyName.ProjectName</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.8">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameEntityFrameworkCoreDbMigrationsModule.cs

@@ -1,16 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace CompanyName.ProjectName.EntityFrameworkCore
-{
-    [DependsOn(
-        typeof(ProjectNameEntityFrameworkCoreModule)
-        )]
-    public class ProjectNameEntityFrameworkCoreDbMigrationsModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            context.Services.AddAbpDbContext<ProjectNameMigrationsDbContext>();
-        }
-    }
-}

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContext.cs

@@ -1,54 +0,0 @@
-using CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore;
-using CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.AuditLogging.EntityFrameworkCore;
-using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.FeatureManagement.EntityFrameworkCore;
-using Volo.Abp.Identity;
-using Volo.Abp.Identity.EntityFrameworkCore;
-using Volo.Abp.IdentityServer.EntityFrameworkCore;
-using Volo.Abp.PermissionManagement.EntityFrameworkCore;
-using Volo.Abp.SettingManagement.EntityFrameworkCore;
-using Volo.Abp.TenantManagement.EntityFrameworkCore;
-
-namespace CompanyName.ProjectName.EntityFrameworkCore
-{
-    /* This DbContext is only used for database migrations.
-     * It is not used on runtime. See ProjectNameDbContext for the runtime DbContext.
-     * It is a unified model that includes configuration for
-     * all used modules and your application.
-     */
-    public class ProjectNameMigrationsDbContext : AbpDbContext<ProjectNameMigrationsDbContext>
-    {
-        public ProjectNameMigrationsDbContext(DbContextOptions<ProjectNameMigrationsDbContext> options)
-            : base(options)
-        {
-        }
-
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            base.OnModelCreating(builder);
-
-            /* Include modules to your migration db context */
-
-            builder.ConfigurePermissionManagement();
-            builder.ConfigureSettingManagement();
-            builder.ConfigureBackgroundJobs();
-            builder.ConfigureAuditLogging();
-            builder.ConfigureIdentity();
-            builder.ConfigureIdentityServer();
-            builder.ConfigureFeatureManagement();
-            builder.ConfigureTenantManagement();
-
-            /* Configure your own tables/entities inside the ConfigureProjectName method */
-
-            builder.ConfigureProjectName();
-
-            // 数据字典
-            builder.ConfigureDataDictionaryManagement();
-
-            builder.ConfigureNotificationManagement();
-        }
-    }
-}

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/CompanyName.ProjectName.EntityFrameworkCore.csproj

@@ -1,24 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\common.props"/>
-  <PropertyGroup>
+    <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>CompanyName.ProjectName</RootNamespace>
+        <RootNamespace>CompanyName.ProjectName</RootNamespace>
-  </PropertyGroup>
+    </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore\CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\modules\NotificationManagement\src\CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore\CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\CompanyName.ProjectName.Domain\CompanyName.ProjectName.Domain.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)" />
-  </ItemGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore\CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.csproj"/>
+        <ProjectReference Include="..\..\..\modules\NotificationManagement\src\CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore\CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore.csproj"/>
+        <ProjectReference Include="..\CompanyName.ProjectName.Domain\CompanyName.ProjectName.Domain.csproj"/>
+        <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+        <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="$(AbpPackageVersion)"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+            <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
 </Project>

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs → aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreProjectNameDbSchemaMigrator.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using CompanyName.ProjectName.Data;
+using Microsoft.EntityFrameworkCore;
 using Volo.Abp.DependencyInjection;
 
 namespace CompanyName.ProjectName.EntityFrameworkCore
@@ -27,7 +27,7 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
              */
 
             await _serviceProvider
-                .GetRequiredService<ProjectNameMigrationsDbContext>()
+                .GetRequiredService<ProjectNameDbContext>()
                 .Database
                 .MigrateAsync();
         }

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameDbContext.cs

@@ -1,4 +1,7 @@
-using CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore;
+using CompanyName.ProjectName.DataDictionaryManagement;
+using CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore;
+using CompanyName.ProjectName.NotificationManagement;
+using CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using CompanyName.ProjectName.Users;
 using Volo.Abp.AuditLogging;
@@ -67,6 +70,14 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
 
         protected override void OnModelCreating(ModelBuilder builder)
         {
+            
+            // 如何设置表前缀
+            // Abp框架表前缀 Abp得不建议修改表前缀
+            // AbpCommonDbProperties.DbTablePrefix = "xxx";
+            // 数据字典表前缀
+            //DataDictionaryManagementDbProperties=“xxx”
+            // 通知模块
+            //NotificationManagementDbProperties = "xxx"
             base.OnModelCreating(builder);
 
             builder.ConfigurePermissionManagement( );
@@ -78,6 +89,13 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
             builder.ConfigureTenantManagement();
             builder.ConfigureIdentityServer();
             builder.ConfigureProjectName();
+            
+            
+            // 数据字典
+            builder.ConfigureDataDictionaryManagement();
+
+            // 消息通知
+            builder.ConfigureNotificationManagement();
         }
     }
 }

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs → aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameMigrationsDbContextFactory.cs

@@ -7,18 +7,18 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
 {
     /* This class is needed for EF Core console commands
      * (like Add-Migration and Update-Database commands) */
-    public class ProjectNameMigrationsDbContextFactory : IDesignTimeDbContextFactory<ProjectNameMigrationsDbContext>
+    public class ProjectNameMigrationsDbContextFactory : IDesignTimeDbContextFactory<ProjectNameDbContext>
     {
-        public ProjectNameMigrationsDbContext CreateDbContext(string[] args)
+        public ProjectNameDbContext CreateDbContext(string[] args)
         {
             ProjectNameEfCoreEntityExtensionMappings.Configure();
 
             var configuration = BuildConfiguration();
 
-            var builder = new DbContextOptionsBuilder<ProjectNameMigrationsDbContext>()
+            var builder = new DbContextOptionsBuilder<ProjectNameDbContext>()
                 .UseMySql(configuration.GetConnectionString("Default"), MySqlServerVersion.LatestSupportedServerVersion);
 
-            return new ProjectNameMigrationsDbContext(builder.Options);
+            return new ProjectNameDbContext(builder.Options);
         }
 
         private static IConfigurationRoot BuildConfiguration()

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/20210903085042_Init.Designer.cs → aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/20211106001555_Init.Designer.cs

@@ -9,8 +9,8 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace CompanyName.ProjectName.Migrations
 {
-    [DbContext(typeof(ProjectNameMigrationsDbContext))]
+    [DbContext(typeof(ProjectNameDbContext))]
-    [Migration("20210903085042_Init")]
+    [Migration("20211106001555_Init")]
     partial class Init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -263,7 +263,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ApplicationName")
@@ -371,7 +370,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("AuditLogId")
@@ -421,7 +419,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("AuditLogId")
@@ -471,7 +468,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("EntityChangeId")
@@ -513,7 +509,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -571,7 +566,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Name")
@@ -602,7 +596,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -649,7 +642,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid?>("SourceTenantId")
@@ -675,7 +667,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -752,7 +743,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Action")
@@ -827,7 +817,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<int>("AccessFailedCount")
@@ -1107,7 +1096,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Code")
@@ -2036,7 +2024,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Name")
@@ -2068,7 +2055,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Name")
@@ -2099,7 +2085,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore.DbMigrations/Migrations/ProjectNameMigrationsDbContextModelSnapshot.cs → aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/Migrations/ProjectNameDbContextModelSnapshot.cs

@@ -8,8 +8,8 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace CompanyName.ProjectName.Migrations
 {
-    [DbContext(typeof(ProjectNameMigrationsDbContext))]
+    [DbContext(typeof(ProjectNameDbContext))]
-    partial class ProjectNameMigrationsDbContextModelSnapshot : ModelSnapshot
+    partial class ProjectNameDbContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
@@ -261,7 +261,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ApplicationName")
@@ -369,7 +368,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("AuditLogId")
@@ -419,7 +417,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("AuditLogId")
@@ -469,7 +466,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("EntityChangeId")
@@ -511,7 +507,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -569,7 +564,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Name")
@@ -600,7 +594,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -647,7 +640,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<Guid?>("SourceTenantId")
@@ -673,7 +665,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -750,7 +741,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Action")
@@ -825,7 +815,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<int>("AccessFailedCount")
@@ -1105,7 +1094,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Code")
@@ -2034,7 +2022,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Name")
@@ -2066,7 +2053,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("Name")
@@ -2097,7 +2083,6 @@ namespace CompanyName.ProjectName.Migrations
             modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
                     b.Property<string>("ConcurrencyStamp")

aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations\CompanyName.ProjectName.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\CompanyName.ProjectName.TestBase\CompanyName.ProjectName.TestBase.csproj" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(AbpPackageVersion)" />
   </ItemGroup>

aspnet-core/services/test/CompanyName.ProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/ProjectNameEntityFrameworkCoreTestModule.cs

@@ -11,8 +11,8 @@ using Volo.Abp.Modularity;
 namespace CompanyName.ProjectName.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(ProjectNameEntityFrameworkCoreDbMigrationsModule),
         typeof(ProjectNameTestBaseModule),
+        typeof(ProjectNameEntityFrameworkCoreModule),
         typeof(AbpEntityFrameworkCoreSqliteModule)
         )]
     public class ProjectNameEntityFrameworkCoreTestModule : AbpModule
@@ -47,11 +47,11 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
             var connection = new SqliteConnection("Data Source=:memory:");
             connection.Open();
 
-            var options = new DbContextOptionsBuilder<ProjectNameMigrationsDbContext>()
+            var options = new DbContextOptionsBuilder<ProjectNameDbContext>()
                 .UseSqlite(connection)
                 .Options;
 
-            using (var context = new ProjectNameMigrationsDbContext(options))
+            using (var context = new ProjectNameDbContext(options))
             {
                 context.GetService<IRelationalDatabaseCreator>().CreateTables();
             }