From 4fc7babd758bbd7f6083e5d8de7b4031e8b97a1d Mon Sep 17 00:00:00 2001 From: Michele Date: Sun, 22 Nov 2020 22:18:20 +0000 Subject: [PATCH] more tentative to fix build --- Dockerfile | 2 +- .../20200102103423_InitialCreate.Designer.cs | 88 +++++++++---------- .../20200102103423_InitialCreate.cs | 62 ++++++------- 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2683efe..e6c5256 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN dotnet publish -c release -o /app --no-restore FROM mcr.microsoft.com/dotnet/aspnet:5.0 WORKDIR /app COPY --from=build /app ./ -ENTRYPOINT ["dotnet", "Sledgemapper.Api.dll"] +ENTRYPOINT ["dotnet", "/app/Sledgemapper.Api.dll"] # # https://hub.docker.com/_/microsoft-dotnet-core diff --git a/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.Designer.cs b/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.Designer.cs index 5198362..1d57dc6 100644 --- a/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.Designer.cs +++ b/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.Designer.cs @@ -1,53 +1,53 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Sledgemapper.Helpers; +// // +// using System; +// using Microsoft.EntityFrameworkCore; +// using Microsoft.EntityFrameworkCore.Infrastructure; +// using Microsoft.EntityFrameworkCore.Metadata; +// using Microsoft.EntityFrameworkCore.Migrations; +// using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +// using Sledgemapper.Helpers; -namespace Sledgemapper.Migrations.SqlServerMigrations -{ - [DbContext(typeof(DataContext))] - [Migration("20200102103423_InitialCreate")] - partial class InitialCreate - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "3.1.0") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); +// namespace Sledgemapper.Migrations.SqlServerMigrations +// { +// [DbContext(typeof(DataContext))] +// [Migration("20200102103423_InitialCreate")] +// partial class InitialCreate +// { +// protected override void BuildTargetModel(ModelBuilder modelBuilder) +// { +// #pragma warning disable 612, 618 +// modelBuilder +// .HasAnnotation("ProductVersion", "3.1.0") +// .HasAnnotation("Relational:MaxIdentifierLength", 128) +// .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - modelBuilder.Entity("Sledgemapper.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int") - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); +// modelBuilder.Entity("Sledgemapper.Entities.User", b => +// { +// b.Property("Id") +// .ValueGeneratedOnAdd() +// .HasColumnType("int") +// .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - b.Property("FirstName") - .HasColumnType("nvarchar(max)"); +// b.Property("FirstName") +// .HasColumnType("nvarchar(max)"); - b.Property("LastName") - .HasColumnType("nvarchar(max)"); +// b.Property("LastName") +// .HasColumnType("nvarchar(max)"); - b.Property("PasswordHash") - .HasColumnType("varbinary(max)"); +// b.Property("PasswordHash") +// .HasColumnType("varbinary(max)"); - b.Property("PasswordSalt") - .HasColumnType("varbinary(max)"); +// b.Property("PasswordSalt") +// .HasColumnType("varbinary(max)"); - b.Property("Username") - .HasColumnType("nvarchar(max)"); +// b.Property("Username") +// .HasColumnType("nvarchar(max)"); - b.HasKey("Id"); +// b.HasKey("Id"); - b.ToTable("Users"); - }); -#pragma warning restore 612, 618 - } - } -} +// b.ToTable("Users"); +// }); +// #pragma warning restore 612, 618 +// } +// } +// } diff --git a/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.cs b/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.cs index 4be075f..cae048f 100644 --- a/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.cs +++ b/Sledgemapper.Api/Migrations/SqlServerMigrations/20200102103423_InitialCreate.cs @@ -1,33 +1,33 @@ -using Microsoft.EntityFrameworkCore.Migrations; +// using Microsoft.EntityFrameworkCore.Migrations; -namespace Sledgemapper.Migrations.SqlServerMigrations -{ - public partial class InitialCreate : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Users", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - FirstName = table.Column(nullable: true), - LastName = table.Column(nullable: true), - Username = table.Column(nullable: true), - PasswordHash = table.Column(nullable: true), - PasswordSalt = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Users", x => x.Id); - }); - } +// namespace Sledgemapper.Migrations.SqlServerMigrations +// { +// public partial class InitialCreate : Migration +// { +// protected override void Up(MigrationBuilder migrationBuilder) +// { +// migrationBuilder.CreateTable( +// name: "Users", +// columns: table => new +// { +// Id = table.Column(nullable: false) +// .Annotation("SqlServer:Identity", "1, 1"), +// FirstName = table.Column(nullable: true), +// LastName = table.Column(nullable: true), +// Username = table.Column(nullable: true), +// PasswordHash = table.Column(nullable: true), +// PasswordSalt = table.Column(nullable: true) +// }, +// constraints: table => +// { +// table.PrimaryKey("PK_Users", x => x.Id); +// }); +// } - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Users"); - } - } -} +// protected override void Down(MigrationBuilder migrationBuilder) +// { +// migrationBuilder.DropTable( +// name: "Users"); +// } +// } +// }