From 9bccc11afcff1855b4edf9ec2c1d0c166e7b609e Mon Sep 17 00:00:00 2001 From: devil_1nc Date: Mon, 22 May 2023 19:37:12 +0400 Subject: [PATCH] Conflict fix 1 --- .../AbstractSoftwareInstallationDatabase.cs | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabase.cs diff --git a/SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabase.cs b/SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabase.cs deleted file mode 100644 index 2f41e0f..0000000 --- a/SoftwareInstallation/AbstractSoftwareInstallationDatabaseImplement/AbstractSoftwareInstallationDatabase.cs +++ /dev/null @@ -1,28 +0,0 @@ -using AbstractPackageInstallationDatabaseImplement.Models; -using AbstractSoftwareInstallationDatabaseImplement.Models; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AbstractSoftwareInstallationDatabaseImplement -{ - public class AbstractSoftwareInstallationDatabase : DbContext - { - protected override void OnConfiguring(DbContextOptionsBuilder -optionsBuilder) - { - if (optionsBuilder.IsConfigured == false) - { - optionsBuilder.UseNpgsql("Host = localhost; Port = 5432; Database = SoftwareInstallation; Username = postgres; Password = postgres"); - } - base.OnConfiguring(optionsBuilder); - } - public virtual DbSet Softwares { set; get; } - public virtual DbSet Packages { set; get; } - public virtual DbSet PackageSoftwares { set; get; } - public virtual DbSet Orders { set; get; } - } -}