From c871497569a4a3a4612fadee6464159f1dc49e6a Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 22 Mar 2017 22:19:33 -0400 Subject: [PATCH] Renaming innermost project to ApplicationCore --- eShopOnWeb.sln | 12 ++++++------ .../ApplicationCore.csproj} | 4 ++++ .../Entities/BaseEntity.cs | 2 +- .../Entities/CatalogBrand.cs | 2 +- .../Entities/CatalogItem.cs | 2 +- .../Entities/CatalogType.cs | 2 +- src/Infrastructure/Infrastructure.csproj | 4 ---- src/Web/Infrastructure/CatalogContext.cs | 8 ++++---- src/Web/Infrastructure/CatalogContextSeed.cs | 2 +- src/Web/Services/CatalogService.cs | 14 +++++++++----- src/Web/ViewModels/Catalog.cs | 2 +- src/Web/ViewModels/CatalogIndex.cs | 2 +- src/Web/Views/Catalog/_product.cshtml | 2 +- src/Web/Web.csproj | 2 +- 14 files changed, 32 insertions(+), 28 deletions(-) rename src/{Business/Business.csproj => ApplicationCore/ApplicationCore.csproj} (67%) rename src/{Business => ApplicationCore}/Entities/BaseEntity.cs (58%) rename src/{Business => ApplicationCore}/Entities/CatalogBrand.cs (63%) rename src/{Business => ApplicationCore}/Entities/CatalogItem.cs (89%) rename src/{Business => ApplicationCore}/Entities/CatalogType.cs (63%) diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln index e106b5c..8e267f6 100644 --- a/eShopOnWeb.sln +++ b/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 - {A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A81FBFCF-757E-4E38-BD15-A9C4DC3A68C0}.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}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FED7440-2311-4D1E-958B-3E887C585CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FED7440-2311-4D1E-958B-3E887C585CD2}.Release|Any CPU.ActiveCfg = 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 diff --git a/src/Business/Business.csproj b/src/ApplicationCore/ApplicationCore.csproj similarity index 67% rename from src/Business/Business.csproj rename to src/ApplicationCore/ApplicationCore.csproj index 9eca547..74295a0 100644 --- a/src/Business/Business.csproj +++ b/src/ApplicationCore/ApplicationCore.csproj @@ -4,4 +4,8 @@ netstandard1.4 + + + + \ No newline at end of file diff --git a/src/Business/Entities/BaseEntity.cs b/src/ApplicationCore/Entities/BaseEntity.cs similarity index 58% rename from src/Business/Entities/BaseEntity.cs rename to src/ApplicationCore/Entities/BaseEntity.cs index be1833c..b021b65 100644 --- a/src/Business/Entities/BaseEntity.cs +++ b/src/ApplicationCore/Entities/BaseEntity.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.Business.Entities +namespace Microsoft.eShopWeb.ApplicationCore.Entities { public class BaseEntity { diff --git a/src/Business/Entities/CatalogBrand.cs b/src/ApplicationCore/Entities/CatalogBrand.cs similarity index 63% rename from src/Business/Entities/CatalogBrand.cs rename to src/ApplicationCore/Entities/CatalogBrand.cs index a13a2c2..1c90dfa 100644 --- a/src/Business/Entities/CatalogBrand.cs +++ b/src/ApplicationCore/Entities/CatalogBrand.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.Business.Entities +namespace Microsoft.eShopWeb.ApplicationCore.Entities { public class CatalogBrand : BaseEntity { diff --git a/src/Business/Entities/CatalogItem.cs b/src/ApplicationCore/Entities/CatalogItem.cs similarity index 89% rename from src/Business/Entities/CatalogItem.cs rename to src/ApplicationCore/Entities/CatalogItem.cs index a591e6d..d0ca18e 100644 --- a/src/Business/Entities/CatalogItem.cs +++ b/src/ApplicationCore/Entities/CatalogItem.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.Business.Entities +namespace Microsoft.eShopWeb.ApplicationCore.Entities { public class CatalogItem : BaseEntity { diff --git a/src/Business/Entities/CatalogType.cs b/src/ApplicationCore/Entities/CatalogType.cs similarity index 63% rename from src/Business/Entities/CatalogType.cs rename to src/ApplicationCore/Entities/CatalogType.cs index a033f2c..d1982a6 100644 --- a/src/Business/Entities/CatalogType.cs +++ b/src/ApplicationCore/Entities/CatalogType.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.Business.Entities +namespace Microsoft.eShopWeb.ApplicationCore.Entities { public class CatalogType : BaseEntity { diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index b08b375..9eca547 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -4,8 +4,4 @@ netstandard1.4 - - - - \ No newline at end of file diff --git a/src/Web/Infrastructure/CatalogContext.cs b/src/Web/Infrastructure/CatalogContext.cs index 795d53d..e2439fd 100644 --- a/src/Web/Infrastructure/CatalogContext.cs +++ b/src/Web/Infrastructure/CatalogContext.cs @@ -1,8 +1,8 @@ -namespace Microsoft.eShopWeb.Infrastructure +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Microsoft.eShopWeb.ApplicationCore.Entities; +namespace Microsoft.eShopWeb.Infrastructure { - using Microsoft.EntityFrameworkCore; - using Microsoft.EntityFrameworkCore.Metadata.Builders; - using Microsoft.eShopWeb.Business.Entities; public class CatalogContext : DbContext { diff --git a/src/Web/Infrastructure/CatalogContextSeed.cs b/src/Web/Infrastructure/CatalogContextSeed.cs index a83a5aa..8646243 100644 --- a/src/Web/Infrastructure/CatalogContextSeed.cs +++ b/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; diff --git a/src/Web/Services/CatalogService.cs b/src/Web/Services/CatalogService.cs index 13b6406..b399350 100644 --- a/src/Web/Services/CatalogService.cs +++ b/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> GetBrands() { var brands = await _context.CatalogBrands.ToListAsync(); - var items = new List(); - items.Add(new SelectListItem() { Value = null, Text = "All", Selected = true }); + var items = new List + { + 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> GetTypes() { var types = await _context.CatalogTypes.ToListAsync(); - var items = new List(); - items.Add(new SelectListItem() { Value = null, Text = "All", Selected = true }); + var items = new List + { + new SelectListItem() { Value = null, Text = "All", Selected = true } + }; foreach (CatalogType type in types) { items.Add(new SelectListItem() { Value = type.Id.ToString(), Text = type.Type }); diff --git a/src/Web/ViewModels/Catalog.cs b/src/Web/ViewModels/Catalog.cs index f70d91f..492d880 100644 --- a/src/Web/ViewModels/Catalog.cs +++ b/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 diff --git a/src/Web/ViewModels/CatalogIndex.cs b/src/Web/ViewModels/CatalogIndex.cs index 2b57e00..82975cc 100644 --- a/src/Web/ViewModels/CatalogIndex.cs +++ b/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 diff --git a/src/Web/Views/Catalog/_product.cshtml b/src/Web/Views/Catalog/_product.cshtml index aaf8226..b22fc20 100644 --- a/src/Web/Views/Catalog/_product.cshtml +++ b/src/Web/Views/Catalog/_product.cshtml @@ -1,4 +1,4 @@ -@model Microsoft.eShopWeb.Business.Entities.CatalogItem +@model Microsoft.eShopWeb.ApplicationCore.Entities.CatalogItem
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index bb6cde5..564c309 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -34,7 +34,7 @@ - +