diff --git a/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj b/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj index 45cdade..3bf6020 100644 --- a/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj +++ b/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj @@ -6,12 +6,6 @@ enable - - - - - - diff --git a/fxl.codes.kisekae.data/KisekaeContext.cs b/fxl.codes.kisekae.data/KisekaeContext.cs index 384aa91..a966251 100644 --- a/fxl.codes.kisekae.data/KisekaeContext.cs +++ b/fxl.codes.kisekae.data/KisekaeContext.cs @@ -1,26 +1,21 @@ using fxl.codes.kisekae.data.Entities; using Microsoft.EntityFrameworkCore; -namespace fxl.codes.kisekae.data +namespace fxl.codes.kisekae.data; + +public class KisekaeContext(DbContextOptions options) : DbContext(options) { - public class KisekaeContext : DbContext + public DbSet KisekaeSets { get; init; } + public DbSet Configurations { get; init; } + public DbSet Cels { get; init; } + public DbSet CelConfigs { get; init; } + public DbSet Renders { get; init; } + public DbSet Palettes { get; init; } + public DbSet PaletteColors { get; init; } + + protected override void OnModelCreating(ModelBuilder modelBuilder) { - public KisekaeContext(DbContextOptions options) : base(options) - { - } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.Entity().Ignore(x => x.Sets); - base.OnModelCreating(modelBuilder); - } - - public DbSet KisekaeSets { get; set; } - public DbSet Configurations { get; set; } - public DbSet Cels { get; set; } - public DbSet CelConfigs { get; set; } - public DbSet Renders { get; set; } - public DbSet Palettes { get; set; } - public DbSet PaletteColors { get; set; } + modelBuilder.Entity().Ignore(x => x.Sets); + base.OnModelCreating(modelBuilder); } } \ No newline at end of file diff --git a/fxl.codes.kisekae.data/Libraries/7z.dll b/fxl.codes.kisekae.data/Libraries/7z.dll new file mode 100755 index 0000000..9295b54 Binary files /dev/null and b/fxl.codes.kisekae.data/Libraries/7z.dll differ diff --git a/fxl.codes.kisekae.data/Libraries/7z.exe b/fxl.codes.kisekae.data/Libraries/7z.exe new file mode 100755 index 0000000..00fc388 Binary files /dev/null and b/fxl.codes.kisekae.data/Libraries/7z.exe differ diff --git a/fxl.codes.kisekae.data/Libraries/7zz b/fxl.codes.kisekae.data/Libraries/7zz new file mode 100755 index 0000000..b9aaac2 Binary files /dev/null and b/fxl.codes.kisekae.data/Libraries/7zz differ diff --git a/fxl.codes.kisekae.data/Libraries/7zzl b/fxl.codes.kisekae.data/Libraries/7zzl new file mode 100755 index 0000000..c63805f Binary files /dev/null and b/fxl.codes.kisekae.data/Libraries/7zzl differ diff --git a/fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs b/fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs index e884ede..22f1b7b 100644 --- a/fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs +++ b/fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs @@ -23,7 +23,7 @@ namespace fxl.codes.kisekae.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Action", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Action", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -44,7 +44,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("Action"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Cel", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Cel", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -80,7 +80,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("Cels"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.CelConfig", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.CelConfig", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -128,7 +128,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("CelConfigs"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.CelPosition", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.CelPosition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -155,7 +155,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("CelPosition"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Configuration", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Configuration", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -188,7 +188,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("Configurations"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Kisekae", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Kisekae", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -207,7 +207,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("KisekaeSets"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Palette", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Palette", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -231,7 +231,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("Palettes"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.PaletteColor", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.PaletteColor", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -255,7 +255,7 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("PaletteColors"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Render", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Render", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -271,37 +271,37 @@ namespace fxl.codes.kisekae.Migrations b.ToTable("Renders"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Action", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Action", b => { - b.HasOne("fxl.codes.kisekae.Entities.Configuration", null) + b.HasOne("fxl.codes.kisekae.data.Entities.Configuration", null) .WithMany("Actions") .HasForeignKey("ConfigurationId"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Cel", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Cel", b => { - b.HasOne("fxl.codes.kisekae.Entities.Kisekae", "Kisekae") + b.HasOne("fxl.codes.kisekae.data.Entities.Kisekae", "Kisekae") .WithMany("Cels") .HasForeignKey("KisekaeId"); b.Navigation("Kisekae"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.CelConfig", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.CelConfig", b => { - b.HasOne("fxl.codes.kisekae.Entities.Cel", "Cel") + b.HasOne("fxl.codes.kisekae.data.Entities.Cel", "Cel") .WithMany() .HasForeignKey("CelId"); - b.HasOne("fxl.codes.kisekae.Entities.Configuration", "Configuration") + b.HasOne("fxl.codes.kisekae.data.Entities.Configuration", "Configuration") .WithMany("Cels") .HasForeignKey("ConfigurationId"); - b.HasOne("fxl.codes.kisekae.Entities.Palette", "Palette") + b.HasOne("fxl.codes.kisekae.data.Entities.Palette", "Palette") .WithMany() .HasForeignKey("PaletteId"); - b.HasOne("fxl.codes.kisekae.Entities.Render", "Render") + b.HasOne("fxl.codes.kisekae.data.Entities.Render", "Render") .WithMany() .HasForeignKey("RenderId"); @@ -314,53 +314,53 @@ namespace fxl.codes.kisekae.Migrations b.Navigation("Render"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.CelPosition", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.CelPosition", b => { - b.HasOne("fxl.codes.kisekae.Entities.CelConfig", null) + b.HasOne("fxl.codes.kisekae.data.Entities.CelConfig", null) .WithMany("Positions") .HasForeignKey("CelConfigId"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Configuration", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Configuration", b => { - b.HasOne("fxl.codes.kisekae.Entities.Kisekae", "Kisekae") + b.HasOne("fxl.codes.kisekae.data.Entities.Kisekae", "Kisekae") .WithMany("Configurations") .HasForeignKey("KisekaeId"); b.Navigation("Kisekae"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Palette", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Palette", b => { - b.HasOne("fxl.codes.kisekae.Entities.Kisekae", "Kisekae") + b.HasOne("fxl.codes.kisekae.data.Entities.Kisekae", "Kisekae") .WithMany("Palettes") .HasForeignKey("KisekaeId"); b.Navigation("Kisekae"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.PaletteColor", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.PaletteColor", b => { - b.HasOne("fxl.codes.kisekae.Entities.Palette", "Palette") + b.HasOne("fxl.codes.kisekae.data.Entities.Palette", "Palette") .WithMany("Colors") .HasForeignKey("PaletteId"); b.Navigation("Palette"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.CelConfig", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.CelConfig", b => { b.Navigation("Positions"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Configuration", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Configuration", b => { b.Navigation("Actions"); b.Navigation("Cels"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Kisekae", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Kisekae", b => { b.Navigation("Cels"); @@ -369,7 +369,7 @@ namespace fxl.codes.kisekae.Migrations b.Navigation("Palettes"); }); - modelBuilder.Entity("fxl.codes.kisekae.Entities.Palette", b => + modelBuilder.Entity("fxl.codes.kisekae.data.Entities.Palette", b => { b.Navigation("Colors"); }); diff --git a/fxl.codes.kisekae.data/Program.cs b/fxl.codes.kisekae.data/Program.cs new file mode 100644 index 0000000..37b36b3 --- /dev/null +++ b/fxl.codes.kisekae.data/Program.cs @@ -0,0 +1,10 @@ +using fxl.codes.kisekae.data; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +var builder = Host.CreateApplicationBuilder(args); +builder.Services.AddDbContextFactory(options => { options.UseNpgsql(builder.Configuration["kisekae:ConnectionString"]); }); + +var app = builder.Build(); +app.Run(); \ No newline at end of file diff --git a/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj b/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj index 7201e52..ce9d1a5 100644 --- a/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj +++ b/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj @@ -4,12 +4,42 @@ net8.0 enable enable + Exe + c3253549-351f-4bcb-9c52-ce67c39cbeaf - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + PreserveNewest + + + + PreserveNewest + + + + PreserveNewest + + + + PreserveNewest + diff --git a/fxl.codes.kisekae/fxl.codes.kisekae.csproj b/fxl.codes.kisekae/fxl.codes.kisekae.csproj index b99718e..905bde2 100644 --- a/fxl.codes.kisekae/fxl.codes.kisekae.csproj +++ b/fxl.codes.kisekae/fxl.codes.kisekae.csproj @@ -8,13 +8,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - -