Commit 00a54884 authored by boncho vylkov's avatar boncho vylkov

merge automapper to master

parents 700fc060 78553b6f
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using MvcCoreTemplate.Models;
using MvcCoreTemplate.Data.Models;
namespace MvcCoreTemplate.Data
{
......
......@@ -8,7 +8,7 @@ using MvcCoreTemplate.Data;
namespace MvcCoreTemplate.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20170424143433_InitialMigration")]
[Migration("20170425144347_InitialMigration")]
partial class InitialMigration
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
......@@ -124,7 +124,7 @@ namespace MvcCoreTemplate.Data.Migrations
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("MvcCoreTemplate.Models.ApplicationUser", b =>
modelBuilder.Entity("MvcCoreTemplate.Data.Models.ApplicationUser", b =>
{
b.Property<string>("Id")
.ValueGeneratedOnAdd();
......@@ -184,7 +184,7 @@ namespace MvcCoreTemplate.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
{
b.HasOne("MvcCoreTemplate.Models.ApplicationUser")
b.HasOne("MvcCoreTemplate.Data.Models.ApplicationUser")
.WithMany("Claims")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
......@@ -192,7 +192,7 @@ namespace MvcCoreTemplate.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
{
b.HasOne("MvcCoreTemplate.Models.ApplicationUser")
b.HasOne("MvcCoreTemplate.Data.Models.ApplicationUser")
.WithMany("Logins")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
......@@ -205,7 +205,7 @@ namespace MvcCoreTemplate.Data.Migrations
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("MvcCoreTemplate.Models.ApplicationUser")
b.HasOne("MvcCoreTemplate.Data.Models.ApplicationUser")
.WithMany("Roles")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
......
......@@ -123,7 +123,7 @@ namespace MvcCoreTemplate.Data.Migrations
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("MvcCoreTemplate.Models.ApplicationUser", b =>
modelBuilder.Entity("MvcCoreTemplate.Data.Models.ApplicationUser", b =>
{
b.Property<string>("Id")
.ValueGeneratedOnAdd();
......@@ -183,7 +183,7 @@ namespace MvcCoreTemplate.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
{
b.HasOne("MvcCoreTemplate.Models.ApplicationUser")
b.HasOne("MvcCoreTemplate.Data.Models.ApplicationUser")
.WithMany("Claims")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
......@@ -191,7 +191,7 @@ namespace MvcCoreTemplate.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
{
b.HasOne("MvcCoreTemplate.Models.ApplicationUser")
b.HasOne("MvcCoreTemplate.Data.Models.ApplicationUser")
.WithMany("Logins")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
......@@ -204,7 +204,7 @@ namespace MvcCoreTemplate.Data.Migrations
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("MvcCoreTemplate.Models.ApplicationUser")
b.HasOne("MvcCoreTemplate.Data.Models.ApplicationUser")
.WithMany("Roles")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
......
......@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MvcCoreTemplate.Models\MvcCoreTemplate.Models.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Models\MvcCoreTemplate.Data.Models.csproj" />
</ItemGroup>
</Project>
\ No newline at end of file
namespace MvcCoreTemplate.Models
namespace MvcCoreTemplate.Data.Models
{
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
......
......@@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using MvcCoreTemplate.Web.Models.AccountViewModels;
using MvcCoreTemplate.Models;
using MvcCoreTemplate.Data.Models;
using MvcCoreTemplate.Services.Web;
namespace MvcCoreTemplate.Web.Controllers
......
......@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using MvcCoreTemplate.Web.Models.ManageViewModels;
using MvcCoreTemplate.Models;
using MvcCoreTemplate.Data.Models;
using MvcCoreTemplate.Services.Web;
namespace MvcCoreTemplate.Web.Controllers
......
......@@ -53,7 +53,7 @@
<ItemGroup>
<ProjectReference Include="..\MvcCoreTemplate.Common\MvcCoreTemplate.Common.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Data\MvcCoreTemplate.Data.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Models\MvcCoreTemplate.Models.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Models\MvcCoreTemplate.Data.Models.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Services.Data\MvcCoreTemplate.Services.Data.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Services.Web\MvcCoreTemplate.Services.Web.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Web.Infrastructure\MvcCoreTemplate.Web.Infrastructure.csproj" />
......
......@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MvcCoreTemplate.Models;
using MvcCoreTemplate.Data.Models;
using MvcCoreTemplate.Data;
using MvcCoreTemplate.Services.Web;
using MvcCoreTemplate.Services.Data;
......
@using Microsoft.AspNetCore.Identity
@using MvcCoreTemplate.Models
@using MvcCoreTemplate.Data.Models
@inject SignInManager<ApplicationUser> SignInManager
@inject UserManager<ApplicationUser> UserManager
......
@using MvcCoreTemplate.Web
@using MvcCoreTemplate.Models
@using MvcCoreTemplate.Data.Models
@using MvcCoreTemplate.Web.Models.AccountViewModels
@using MvcCoreTemplate.Web.Models.ManageViewModels
@using Microsoft.AspNetCore.Identity
......
......@@ -7,14 +7,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcCoreTemplate.Web", "MvcC
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcCoreTemplate.Models", "MvcCoreTemplate.Models\MvcCoreTemplate.Models.csproj", "{C34194B5-7ACE-41B7-A7E4-CFB974586F27}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Data.Models", "MvcCoreTemplate.Models\MvcCoreTemplate.Data.Models.csproj", "{01E841C9-E88C-4225-9F2D-C42F90EFF17B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcCoreTemplate.Data", "MvcCoreTemplate.Data\MvcCoreTemplate.Data.csproj", "{68C6102D-07D6-4C85-B682-9BCECDF8BD3F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{9680B400-5AB2-48DA-BF05-D62C9E9E50B9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C19362E2-DE5D-410B-80E4-F7C949FFBD2B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Models", "Models", "{79B56892-66B0-4FE6-9A8C-D7F0D26F0DD1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{880AD230-6FB7-4652-BFF3-B5EFA22F976B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcCoreTemplate.Common", "MvcCoreTemplate.Common\MvcCoreTemplate.Common.csproj", "{091BEF53-262A-42DC-8C5A-C4762919F59A}"
......@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Services.Da
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Services.Web", "MvcCoreTemplate.Services.Web\MvcCoreTemplate.Services.Web.csproj", "{61EEFBFD-1C6F-4F6B-9D2D-9D0C5BD5E71E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Data.Common", "MvcCoreTemplate.Data.Common\MvcCoreTemplate.Data.Common.csproj", "{EA1C820E-9705-48B2-AD18-7121FCAF651D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -41,6 +43,10 @@ Global
{C34194B5-7ACE-41B7-A7E4-CFB974586F27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C34194B5-7ACE-41B7-A7E4-CFB974586F27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C34194B5-7ACE-41B7-A7E4-CFB974586F27}.Release|Any CPU.Build.0 = Release|Any CPU
{01E841C9-E88C-4225-9F2D-C42F90EFF17B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01E841C9-E88C-4225-9F2D-C42F90EFF17B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01E841C9-E88C-4225-9F2D-C42F90EFF17B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01E841C9-E88C-4225-9F2D-C42F90EFF17B}.Release|Any CPU.Build.0 = Release|Any CPU
{68C6102D-07D6-4C85-B682-9BCECDF8BD3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68C6102D-07D6-4C85-B682-9BCECDF8BD3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68C6102D-07D6-4C85-B682-9BCECDF8BD3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -49,12 +55,10 @@ Global
{091BEF53-262A-42DC-8C5A-C4762919F59A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{091BEF53-262A-42DC-8C5A-C4762919F59A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{091BEF53-262A-42DC-8C5A-C4762919F59A}.Release|Any CPU.Build.0 = Release|Any CPU
<<<<<<< HEAD
{BB1F48A6-56F0-42B9-B2E2-9D84842A6CC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB1F48A6-56F0-42B9-B2E2-9D84842A6CC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB1F48A6-56F0-42B9-B2E2-9D84842A6CC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB1F48A6-56F0-42B9-B2E2-9D84842A6CC8}.Release|Any CPU.Build.0 = Release|Any CPU
=======
{2EF76BFD-952F-4B4A-B82A-5F495DFD21D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EF76BFD-952F-4B4A-B82A-5F495DFD21D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EF76BFD-952F-4B4A-B82A-5F495DFD21D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -63,21 +67,22 @@ Global
{61EEFBFD-1C6F-4F6B-9D2D-9D0C5BD5E71E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61EEFBFD-1C6F-4F6B-9D2D-9D0C5BD5E71E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61EEFBFD-1C6F-4F6B-9D2D-9D0C5BD5E71E}.Release|Any CPU.Build.0 = Release|Any CPU
>>>>>>> master
{EA1C820E-9705-48B2-AD18-7121FCAF651D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA1C820E-9705-48B2-AD18-7121FCAF651D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA1C820E-9705-48B2-AD18-7121FCAF651D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA1C820E-9705-48B2-AD18-7121FCAF651D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EAF7E304-94B2-4608-ACC0-285624B68C20} = {9680B400-5AB2-48DA-BF05-D62C9E9E50B9}
{C34194B5-7ACE-41B7-A7E4-CFB974586F27} = {79B56892-66B0-4FE6-9A8C-D7F0D26F0DD1}
{C34194B5-7ACE-41B7-A7E4-CFB974586F27} = {C19362E2-DE5D-410B-80E4-F7C949FFBD2B}
{68C6102D-07D6-4C85-B682-9BCECDF8BD3F} = {C19362E2-DE5D-410B-80E4-F7C949FFBD2B}
{091BEF53-262A-42DC-8C5A-C4762919F59A} = {880AD230-6FB7-4652-BFF3-B5EFA22F976B}
<<<<<<< HEAD
{BB1F48A6-56F0-42B9-B2E2-9D84842A6CC8} = {9680B400-5AB2-48DA-BF05-D62C9E9E50B9}
=======
{2EF76BFD-952F-4B4A-B82A-5F495DFD21D0} = {3A79ADCA-45DD-43CE-8D3E-4D5F10945C4E}
{61EEFBFD-1C6F-4F6B-9D2D-9D0C5BD5E71E} = {3A79ADCA-45DD-43CE-8D3E-4D5F10945C4E}
>>>>>>> master
{EA1C820E-9705-48B2-AD18-7121FCAF651D} = {C19362E2-DE5D-410B-80E4-F7C949FFBD2B}
EndGlobalSection
EndGlobal
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment