Renaming innermost project to ApplicationCore

eShopOnWeb.sln

@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure", "src\Infra
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "src\Web\Web.csproj", "{9CB6566E-E86A-4C07-BB8D-E0B95BCD4BD2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business", "src\Business\Business.csproj", "{A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationCore", "src\ApplicationCore\ApplicationCore.csproj", "{7FED7440-2311-4D1E-958B-3E887C585CD2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,10 +25,10 @@ Global
 		{9CB6566E-E86A-4C07-BB8D-E0B95BCD4BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9CB6566E-E86A-4C07-BB8D-E0B95BCD4BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9CB6566E-E86A-4C07-BB8D-E0B95BCD4BD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FED7440-2311-4D1E-958B-3E887C585CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FED7440-2311-4D1E-958B-3E887C585CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FED7440-2311-4D1E-958B-3E887C585CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FED7440-2311-4D1E-958B-3E887C585CD2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -36,6 +36,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{7C461394-ABDC-43CD-A798-71249C58BA67} = {419A6ACE-0419-4315-A6FB-B0E63D39432E}
 		{9CB6566E-E86A-4C07-BB8D-E0B95BCD4BD2} = {419A6ACE-0419-4315-A6FB-B0E63D39432E}
-		{A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0} = {419A6ACE-0419-4315-A6FB-B0E63D39432E}
+		{7FED7440-2311-4D1E-958B-3E887C585CD2} = {419A6ACE-0419-4315-A6FB-B0E63D39432E}
 	EndGlobalSection
 EndGlobal

src/Business/Business.csproj → src/ApplicationCore/ApplicationCore.csproj

@@ -4,4 +4,8 @@
     <TargetFramework>netstandard1.4</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="Interfaces\" />
+  </ItemGroup>
+
 </Project>

src/Business/Entities/BaseEntity.cs → src/ApplicationCore/Entities/BaseEntity.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.Business.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities
 {
     public class BaseEntity
     {

src/Business/Entities/CatalogBrand.cs → src/ApplicationCore/Entities/CatalogBrand.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.Business.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities
 {
     public class CatalogBrand : BaseEntity
     {

src/Business/Entities/CatalogItem.cs → src/ApplicationCore/Entities/CatalogItem.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.Business.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities
 {
     public class CatalogItem : BaseEntity
     {

src/Business/Entities/CatalogType.cs → src/ApplicationCore/Entities/CatalogType.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.Business.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities
 {
     public class CatalogType : BaseEntity
     {

src/Infrastructure/Infrastructure.csproj

@@ -4,8 +4,4 @@
     <TargetFramework>netstandard1.4</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Business\Business.csproj" />
-  </ItemGroup>
-
 </Project>

src/Web/Infrastructure/CatalogContext.cs

@@ -1,8 +1,8 @@
-namespace Microsoft.eShopWeb.Infrastructure
+using Microsoft.EntityFrameworkCore;
-{
-    using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-    using Microsoft.eShopWeb.Business.Entities;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
+namespace Microsoft.eShopWeb.Infrastructure
+{
 
     public class CatalogContext : DbContext
     {

src/Web/Infrastructure/CatalogContextSeed.cs

@@ -2,7 +2,7 @@
 {
     using Microsoft.AspNetCore.Builder;
     using Microsoft.EntityFrameworkCore;
-    using Microsoft.eShopWeb.Business.Entities;
+    using Microsoft.eShopWeb.ApplicationCore.Entities;
     using Microsoft.Extensions.Logging;
     using System;
     using System.Collections.Generic;

src/Web/Services/CatalogService.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Microsoft.eShopWeb.Infrastructure;
 using Microsoft.eShopWeb.ViewModels;
-using Microsoft.eShopWeb.Business.Entities;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 
 namespace Microsoft.eShopWeb.Services
 {
@@ -51,8 +51,10 @@ namespace Microsoft.eShopWeb.Services
         public async Task<IEnumerable<SelectListItem>> GetBrands()
         {
             var brands = await _context.CatalogBrands.ToListAsync();
-            var items = new List<SelectListItem>();
+            var items = new List<SelectListItem>
-            items.Add(new SelectListItem() { Value = null, Text = "All", Selected = true });
+            {
+                new SelectListItem() { Value = null, Text = "All", Selected = true }
+            };
             foreach (CatalogBrand brand in brands)
             {
                 items.Add(new SelectListItem() { Value = brand.Id.ToString(), Text = brand.Brand });
@@ -64,8 +66,10 @@ namespace Microsoft.eShopWeb.Services
         public async Task<IEnumerable<SelectListItem>> GetTypes()
         {
             var types = await _context.CatalogTypes.ToListAsync();
-            var items = new List<SelectListItem>();
+            var items = new List<SelectListItem>
-            items.Add(new SelectListItem() { Value = null, Text = "All", Selected = true });
+            {
+                new SelectListItem() { Value = null, Text = "All", Selected = true }
+            };
             foreach (CatalogType type in types)
             {
                 items.Add(new SelectListItem() { Value = type.Id.ToString(), Text = type.Type });

src/Web/ViewModels/Catalog.cs

@@ -1,4 +1,4 @@
-using Microsoft.eShopWeb.Business.Entities;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 using System.Collections.Generic;
 
 namespace Microsoft.eShopWeb.ViewModels

src/Web/ViewModels/CatalogIndex.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.eShopWeb.Business.Entities;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
 using System.Collections.Generic;
 
 namespace Microsoft.eShopWeb.ViewModels

src/Web/Views/Catalog/_product.cshtml

@@ -1,4 +1,4 @@
-@model Microsoft.eShopWeb.Business.Entities.CatalogItem
+@model Microsoft.eShopWeb.ApplicationCore.Entities.CatalogItem
 
 
 <form asp-controller="Cart" asp-action="AddToCart">

src/Web/Web.csproj

@@ -34,7 +34,7 @@
     <Folder Include="wwwroot\fonts\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Business\Business.csproj" />
+    <ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />
   </ItemGroup>
 
 </Project>