Commit ffb53535 authored by boncho vylkov's avatar boncho vylkov

merge with master

parents 00a54884 1b6ab0cb
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using System;
namespace MvcCoreTemplate.Data.Models
{
public class ApplicationUser : IdentityUser
{
}
}
......@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MvcCoreTemplate.Models\MvcCoreTemplate.Data.Models.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Data.Models\MvcCoreTemplate.Data.Models.csproj" />
</ItemGroup>
</Project>
\ No newline at end of file
namespace MvcCoreTemplate.Data.Models
{
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
// Add profile data for application users by adding properties to the ApplicationUser class
public class ApplicationUser : IdentityUser
{
}
}
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>
......
......@@ -52,8 +52,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MvcCoreTemplate.Common\MvcCoreTemplate.Common.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Data.Models\MvcCoreTemplate.Data.Models.csproj" />
<ProjectReference Include="..\MvcCoreTemplate.Data\MvcCoreTemplate.Data.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,10 +5,6 @@ VisualStudioVersion = 15.0.26403.7
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcCoreTemplate.Web", "MvcCoreTemplate.Web\MvcCoreTemplate.Web.csproj", "{EAF7E304-94B2-4608-ACC0-285624B68C20}"
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}"
......@@ -29,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Services.We
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Data.Common", "MvcCoreTemplate.Data.Common\MvcCoreTemplate.Data.Common.csproj", "{EA1C820E-9705-48B2-AD18-7121FCAF651D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcCoreTemplate.Data.Models", "MvcCoreTemplate.Data.Models\MvcCoreTemplate.Data.Models.csproj", "{F0286C24-B055-4C9C-97BE-13C0EBCB0031}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -39,14 +37,6 @@ Global
{EAF7E304-94B2-4608-ACC0-285624B68C20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAF7E304-94B2-4608-ACC0-285624B68C20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAF7E304-94B2-4608-ACC0-285624B68C20}.Release|Any CPU.Build.0 = Release|Any CPU
{C34194B5-7ACE-41B7-A7E4-CFB974586F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{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
......@@ -71,18 +61,22 @@ Global
{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
{F0286C24-B055-4C9C-97BE-13C0EBCB0031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0286C24-B055-4C9C-97BE-13C0EBCB0031}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0286C24-B055-4C9C-97BE-13C0EBCB0031}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0286C24-B055-4C9C-97BE-13C0EBCB0031}.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} = {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}
{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}
{EA1C820E-9705-48B2-AD18-7121FCAF651D} = {C19362E2-DE5D-410B-80E4-F7C949FFBD2B}
{F0286C24-B055-4C9C-97BE-13C0EBCB0031} = {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