...

3 files changed, 6 insertions, 183 deletions

diff --git a/Timeline/Migrations/20190822072156_AddUserDetail.Designer.cs b/Timeline/Migrations/20190822072156_AddUserDetail.Designer.cs
deleted file mode 100644
index 2bbcf673..00000000
--- a/Timeline/Migrations/20190822072156_AddUserDetail.Designer.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// <auto-generated />

-using System;

-using Microsoft.EntityFrameworkCore;

-using Microsoft.EntityFrameworkCore.Infrastructure;

-using Microsoft.EntityFrameworkCore.Migrations;

-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using Timeline.Entities;

-

-namespace Timeline.Migrations

-{

-    [DbContext(typeof(DatabaseContext))]

-    [Migration("20190822072156_AddUserDetail")]

-    partial class AddUserDetail

-    {

-        protected override void BuildTargetModel(ModelBuilder modelBuilder)

-        {

-#pragma warning disable 612, 618

-            modelBuilder

-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")

-                .HasAnnotation("Relational:MaxIdentifierLength", 64);

-

-            modelBuilder.Entity("Timeline.Entities.User", b =>

-                {

-                    b.Property<long>("Id")

-                        .ValueGeneratedOnAdd()

-                        .HasColumnName("id");

-

-                    b.Property<string>("EncryptedPassword")

-                        .IsRequired()

-                        .HasColumnName("password");

-

-                    b.Property<string>("Name")

-                        .IsRequired()

-                        .HasColumnName("name")

-                        .HasMaxLength(26);

-

-                    b.Property<string>("RoleString")

-                        .IsRequired()

-                        .HasColumnName("roles");

-

-                    b.Property<long>("Version")

-                        .ValueGeneratedOnAdd()

-                        .HasColumnName("version")

-                        .HasDefaultValue(0L);

-

-                    b.HasKey("Id");

-

-                    b.HasIndex("Name")

-                        .IsUnique();

-

-                    b.ToTable("users");

-                });

-

-            modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>

-                {

-                    b.Property<long>("Id")

-                        .ValueGeneratedOnAdd()

-                        .HasColumnName("id");

-

-                    b.Property<byte[]>("Data")

-                        .HasColumnName("data");

-

-                    b.Property<string>("ETag")

-                        .HasColumnName("etag")

-                        .HasMaxLength(30);

-

-                    b.Property<DateTime>("LastModified")

-                        .HasColumnName("last_modified");

-

-                    b.Property<string>("Type")

-                        .HasColumnName("type");

-

-                    b.Property<long>("UserId");

-

-                    b.HasKey("Id");

-

-                    b.HasIndex("UserId")

-                        .IsUnique();

-

-                    b.ToTable("user_avatars");

-                });

-

-            modelBuilder.Entity("Timeline.Entities.UserDetailEntity", b =>

-                {

-                    b.Property<long>("Id")

-                        .ValueGeneratedOnAdd()

-                        .HasColumnName("id");

-

-                    b.Property<string>("Description")

-                        .HasColumnName("description");

-

-                    b.Property<string>("EMail")

-                        .HasColumnName("email")

-                        .HasMaxLength(50);

-

-                    b.Property<string>("Nickname")

-                        .HasColumnName("nickname")

-                        .HasMaxLength(15);

-

-                    b.Property<string>("PhoneNumber")

-                        .HasColumnName("phone_number")

-                        .HasMaxLength(15);

-

-                    b.Property<string>("QQ")

-                        .HasColumnName("qq")

-                        .HasMaxLength(15);

-

-                    b.Property<long>("UserId");

-

-                    b.HasKey("Id");

-

-                    b.HasIndex("UserId")

-                        .IsUnique();

-

-                    b.ToTable("user_details");

-                });

-

-            modelBuilder.Entity("Timeline.Entities.UserAvatar", b =>

-                {

-                    b.HasOne("Timeline.Entities.User")

-                        .WithOne("Avatar")

-                        .HasForeignKey("Timeline.Entities.UserAvatar", "UserId")

-                        .OnDelete(DeleteBehavior.Cascade);

-                });

-

-            modelBuilder.Entity("Timeline.Entities.UserDetailEntity", b =>

-                {

-                    b.HasOne("Timeline.Entities.User")

-                        .WithOne("Detail")

-                        .HasForeignKey("Timeline.Entities.UserDetailEntity", "UserId")

-                        .OnDelete(DeleteBehavior.Cascade);

-                });

-#pragma warning restore 612, 618

-        }

-    }

-}

diff --git a/Timeline/Migrations/20190822072156_AddUserDetail.cs b/Timeline/Migrations/20190822072156_AddUserDetail.cs
deleted file mode 100644
index 4aa6446b..00000000
--- a/Timeline/Migrations/20190822072156_AddUserDetail.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;

-using Microsoft.EntityFrameworkCore.Migrations;

-

-namespace Timeline.Migrations

-{

-    public partial class AddUserDetail : Migration

-    {

-        protected override void Up(MigrationBuilder migrationBuilder)

-        {

-            migrationBuilder.CreateTable(

-                name: "user_details",

-                columns: table => new

-                {

-                    id = table.Column<long>(nullable: false)

-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),

-                    nickname = table.Column<string>(maxLength: 15, nullable: true),

-                    qq = table.Column<string>(maxLength: 15, nullable: true),

-                    email = table.Column<string>(maxLength: 50, nullable: true),

-                    phone_number = table.Column<string>(maxLength: 15, nullable: true),

-                    description = table.Column<string>(nullable: true),

-                    UserId = table.Column<long>(nullable: false)

-                },

-                constraints: table =>

-                {

-                    table.PrimaryKey("PK_user_details", x => x.id);

-                    table.ForeignKey(

-                        name: "FK_user_details_users_UserId",

-                        column: x => x.UserId,

-                        principalTable: "users",

-                        principalColumn: "id",

-                        onDelete: ReferentialAction.Cascade);

-                });

-

-            migrationBuilder.CreateIndex(

-                name: "IX_user_details_UserId",

-                table: "user_details",

-                column: "UserId",

-                unique: true);

-        }

-

-        protected override void Down(MigrationBuilder migrationBuilder)

-        {

-            migrationBuilder.DropTable(

-                name: "user_details");

-        }

-    }

-}

diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj
index d2d3fa67..a948e3f3 100644
--- a/Timeline/Timeline.csproj
+++ b/Timeline/Timeline.csproj
@@ -21,6 +21,12 @@
             <PrivateAssets>all</PrivateAssets>

             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

         </PackageReference>

+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />

+        <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="3.0.0" />

+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">

+          <PrivateAssets>all</PrivateAssets>

+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

+        </PackageReference>

         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0-rc1.final" />

         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />

         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-dev002868" />