diff options
| author | Kamen Mladenov <kamen.d.mladenov@protonmail.com> | 2021-05-16 05:17:37 +0000 |
|---|---|---|
| committer | Kamen Mladenov <kamen.d.mladenov@protonmail.com> | 2021-05-16 05:17:37 +0000 |
| commit | ffd59fcdc11b8b57cab30be090d2775d2b6b1ba3 (patch) | |
| tree | 3e82cb2864aec05505509e1afc01c6843f0a64a9 /ExamTemplate/Data | |
| parent | 2ac139d0854c0f6d1b4cebc1487dd41128f00c60 (diff) | |
| parent | 564209043493c77fd51ac096b5a160bb20c46f12 (diff) | |
| download | it-kariera-exam-template-ffd59fcdc11b8b57cab30be090d2775d2b6b1ba3.tar it-kariera-exam-template-ffd59fcdc11b8b57cab30be090d2775d2b6b1ba3.tar.gz it-kariera-exam-template-ffd59fcdc11b8b57cab30be090d2775d2b6b1ba3.zip | |
Merge branch 'fuckoff' into 'master'
New structure
See merge request Syndamia/it-kariera-exam-template!2
Diffstat (limited to 'ExamTemplate/Data')
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs (renamed from ExamTemplate/Data/Models/BaseModel.cs) | 0 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj | 11 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data.Models/User.cs (renamed from ExamTemplate/Data/Models/User.cs) | 0 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj (renamed from ExamTemplate/Data/Data.csproj) | 3 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs (renamed from ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs) | 0 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs (renamed from ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs) | 0 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs (renamed from ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs) | 0 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs (renamed from ExamTemplate/Data/TemplateContext.cs) | 0 | ||||
| -rw-r--r-- | ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs (renamed from ExamTemplate/Data/TemplateContextFactory.cs) | 2 |
9 files changed, 14 insertions, 2 deletions
diff --git a/ExamTemplate/Data/Models/BaseModel.cs b/ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs index 5e7b75c..5e7b75c 100644 --- a/ExamTemplate/Data/Models/BaseModel.cs +++ b/ExamTemplate/Data/ExamTemplate.Data.Models/BaseModel.cs diff --git a/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj b/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj new file mode 100644 index 0000000..7e76cb8 --- /dev/null +++ b/ExamTemplate/Data/ExamTemplate.Data.Models/ExamTemplate.Data.Models.csproj @@ -0,0 +1,11 @@ +<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net5.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup> + <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.5" /> + </ItemGroup>
+
+</Project>
diff --git a/ExamTemplate/Data/Models/User.cs b/ExamTemplate/Data/ExamTemplate.Data.Models/User.cs index 8fa698d..8fa698d 100644 --- a/ExamTemplate/Data/Models/User.cs +++ b/ExamTemplate/Data/ExamTemplate.Data.Models/User.cs diff --git a/ExamTemplate/Data/Data.csproj b/ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj index 098f532..0e2657c 100644 --- a/ExamTemplate/Data/Data.csproj +++ b/ExamTemplate/Data/ExamTemplate.Data/ExamTemplate.Data.csproj @@ -1,7 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> - <ProjectReference Include="..\Common\Common.csproj" /> + <ProjectReference Include="..\ExamTemplate.Data.Models\ExamTemplate.Data.Models.csproj" /> + <ProjectReference Include="..\..\Common\ExamTemplate.Common\ExamTemplate.Common.csproj" /> </ItemGroup>
<ItemGroup> diff --git a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs index d15b462..d15b462 100644 --- a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs +++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.Designer.cs diff --git a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs index a2f78ad..a2f78ad 100644 --- a/ExamTemplate/Data/Migrations/20210506172429_ImplementedUserAndRole.cs +++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/20210506172429_ImplementedUserAndRole.cs diff --git a/ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs b/ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs index 3286121..3286121 100644 --- a/ExamTemplate/Data/Migrations/TemplateContextModelSnapshot.cs +++ b/ExamTemplate/Data/ExamTemplate.Data/Migrations/TemplateContextModelSnapshot.cs diff --git a/ExamTemplate/Data/TemplateContext.cs b/ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs index 268812d..268812d 100644 --- a/ExamTemplate/Data/TemplateContext.cs +++ b/ExamTemplate/Data/ExamTemplate.Data/TemplateContext.cs diff --git a/ExamTemplate/Data/TemplateContextFactory.cs b/ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs index dff2e9e..8b2c0fa 100644 --- a/ExamTemplate/Data/TemplateContextFactory.cs +++ b/ExamTemplate/Data/ExamTemplate.Data/TemplateContextFactory.cs @@ -10,7 +10,7 @@ namespace ExamTemplate.Data public TemplateContext CreateDbContext(string[] args) { var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory() + "/../Web/") + .SetBasePath(Directory.GetCurrentDirectory() + "/../../Web/CarShop.Web/") .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) .AddJsonFile("appsettings.Development.json", optional: true) .Build(); |