merge migrations

Author: Musa Demir

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj

@@ -258,13 +258,9 @@
     <Compile Include="Migrations\201910240752449_Upgraded_To_ABP_5_0_0.designer.cs">
       <DependentUpon>201910240752449_Upgraded_To_ABP_5_0_0.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\201912170600147_Upgrade_To_ABP_5_1_0.cs" />
-    <Compile Include="Migrations\201912170600147_Upgrade_To_ABP_5_1_0.designer.cs">
-      <DependentUpon>201912170600147_Upgrade_To_ABP_5_1_0.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201912171252414_Test.cs" />
-    <Compile Include="Migrations\201912171252414_Test.designer.cs">
-      <DependentUpon>201912171252414_Test.cs</DependentUpon>
+    <Compile Include="Migrations\201912171340379_Upgraded_To_ABP_5_1_0.cs" />
+    <Compile Include="Migrations\201912171340379_Upgraded_To_ABP_5_1_0.designer.cs">
+      <DependentUpon>201912171340379_Upgraded_To_ABP_5_1_0.cs</DependentUpon>
     </Compile>
     <Compile Include="Migrations\AbpZeroDbMigrator.cs" />
     <Compile Include="Migrations\Configuration.cs" />
@@ -312,11 +308,8 @@
     <EmbeddedResource Include="Migrations\201910240752449_Upgraded_To_ABP_5_0_0.resx">
       <DependentUpon>201910240752449_Upgraded_To_ABP_5_0_0.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201912170600147_Upgrade_To_ABP_5_1_0.resx">
-      <DependentUpon>201912170600147_Upgrade_To_ABP_5_1_0.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201912171252414_Test.resx">
-      <DependentUpon>201912171252414_Test.cs</DependentUpon>
+    <EmbeddedResource Include="Migrations\201912171340379_Upgraded_To_ABP_5_1_0.resx">
+      <DependentUpon>201912171340379_Upgraded_To_ABP_5_1_0.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201912170600147_Upgrade_To_ABP_5_1_0.cs

@@ -3,22 +3,28 @@
     using System;
     using System.Data.Entity.Migrations;
 
-    public partial class Test : DbMigration
+    public partial class Upgraded_To_ABP_5_1_0 : DbMigration
     {
         public override void Up()
         {
+            DropIndex("dbo.AbpBackgroundJobs", new[] { "IsAbandoned", "NextTryTime" });
             DropIndex("dbo.AbpUserLoginAttempts", new[] { "TenancyName", "UserNameOrEmailAddress", "Result" });
             AlterColumn("dbo.AbpSettings", "Value", c => c.String());
             AlterColumn("dbo.AbpUserLoginAttempts", "UserNameOrEmailAddress", c => c.String(maxLength: 256));
+            CreateIndex("dbo.AbpBackgroundJobs", new[] { "Priority", "TryCount", "NextTryTime" });
+            CreateIndex("dbo.AbpBackgroundJobs", "IsAbandoned", name: "IX_IsAbandoned_NextTryTime");
             CreateIndex("dbo.AbpUserLoginAttempts", new[] { "TenancyName", "UserNameOrEmailAddress", "Result" });
         }
 
         public override void Down()
         {
             DropIndex("dbo.AbpUserLoginAttempts", new[] { "TenancyName", "UserNameOrEmailAddress", "Result" });
+            DropIndex("dbo.AbpBackgroundJobs", "IX_IsAbandoned_NextTryTime");
+            DropIndex("dbo.AbpBackgroundJobs", new[] { "Priority", "TryCount", "NextTryTime" });
             AlterColumn("dbo.AbpUserLoginAttempts", "UserNameOrEmailAddress", c => c.String(maxLength: 255));
             AlterColumn("dbo.AbpSettings", "Value", c => c.String(maxLength: 2000));
             CreateIndex("dbo.AbpUserLoginAttempts", new[] { "TenancyName", "UserNameOrEmailAddress", "Result" });
+            CreateIndex("dbo.AbpBackgroundJobs", new[] { "IsAbandoned", "NextTryTime" });
         }
     }
 }