From 10e9eef6c2354a055cd70f9b966a16c2baa211d4 Mon Sep 17 00:00:00 2001 From: themagicmartin <mart238e@hotmail.com> Date: Thu, 3 Apr 2025 11:01:06 +0200 Subject: [PATCH] Fixed migration conflicts --- .../20250317120113_Migration2.Designer.cs | 3 --- .../20250317121405_Migration3.Designer.cs | 3 --- .../Migrations/20250403083834_Identity.cs | 20 ------------------- 3 files changed, 26 deletions(-) diff --git a/ExperienceEfCore/Migrations/20250317120113_Migration2.Designer.cs b/ExperienceEfCore/Migrations/20250317120113_Migration2.Designer.cs index c77b80a..e0ab855 100644 --- a/ExperienceEfCore/Migrations/20250317120113_Migration2.Designer.cs +++ b/ExperienceEfCore/Migrations/20250317120113_Migration2.Designer.cs @@ -85,9 +85,6 @@ namespace ExperienceEfCore.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property<byte[]>("OperatorPermitPdf") - .HasColumnType("varbinary(max)"); - b.Property<string>("PhoneNo") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/ExperienceEfCore/Migrations/20250317121405_Migration3.Designer.cs b/ExperienceEfCore/Migrations/20250317121405_Migration3.Designer.cs index 441baed..31c3d3a 100644 --- a/ExperienceEfCore/Migrations/20250317121405_Migration3.Designer.cs +++ b/ExperienceEfCore/Migrations/20250317121405_Migration3.Designer.cs @@ -85,9 +85,6 @@ namespace ExperienceEfCore.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property<byte[]>("OperatorPermitPdf") - .HasColumnType("varbinary(max)"); - b.Property<string>("PhoneNo") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/ExperienceEfCore/Migrations/20250403083834_Identity.cs b/ExperienceEfCore/Migrations/20250403083834_Identity.cs index eeeb1d8..c5b68c2 100644 --- a/ExperienceEfCore/Migrations/20250403083834_Identity.cs +++ b/ExperienceEfCore/Migrations/20250403083834_Identity.cs @@ -11,16 +11,6 @@ namespace ExperienceEfCore.Migrations /// <inheritdoc /> protected override void Up(MigrationBuilder migrationBuilder) { - migrationBuilder.DropColumn( - name: "OperatorPermitPdf", - table: "Providers"); - - migrationBuilder.AddColumn<bool>( - name: "HasOperatorPermit", - table: "Providers", - type: "bit", - nullable: false, - defaultValue: false); migrationBuilder.CreateTable( name: "AspNetRoles", @@ -231,16 +221,6 @@ namespace ExperienceEfCore.Migrations migrationBuilder.DropTable( name: "AspNetUsers"); - - migrationBuilder.DropColumn( - name: "HasOperatorPermit", - table: "Providers"); - - migrationBuilder.AddColumn<byte[]>( - name: "OperatorPermitPdf", - table: "Providers", - type: "varbinary(max)", - nullable: true); } } } -- GitLab