diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj index efe80ba..c24f5e0 100644 --- a/src/ApplicationCore/ApplicationCore.csproj +++ b/src/ApplicationCore/ApplicationCore.csproj @@ -2,6 +2,7 @@ netstandard2.0 + Microsoft.eShopWeb.ApplicationCore diff --git a/src/ApplicationCore/Entities/BasketAggregate/Basket.cs b/src/ApplicationCore/Entities/BasketAggregate/Basket.cs index f671292..6713266 100644 --- a/src/ApplicationCore/Entities/BasketAggregate/Basket.cs +++ b/src/ApplicationCore/Entities/BasketAggregate/Basket.cs @@ -1,4 +1,4 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Collections.Generic; using System.Linq; diff --git a/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs b/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs index f20b2c6..15f336c 100644 --- a/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs +++ b/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs @@ -1,9 +1,9 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Ardalis.GuardClauses; using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Collections.Generic; -namespace ApplicationCore.Entities.BuyerAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate { public class Buyer : BaseEntity, IAggregateRoot { diff --git a/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs b/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs index e807e1c..0bb9df4 100644 --- a/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs +++ b/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs @@ -1,6 +1,6 @@ using Microsoft.eShopWeb.ApplicationCore.Entities; -namespace ApplicationCore.Entities.BuyerAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate { public class PaymentMethod : BaseEntity { diff --git a/src/ApplicationCore/Entities/OrderAggregate/Address.cs b/src/ApplicationCore/Entities/OrderAggregate/Address.cs index 85804b5..1c9fd64 100644 --- a/src/ApplicationCore/Entities/OrderAggregate/Address.cs +++ b/src/ApplicationCore/Entities/OrderAggregate/Address.cs @@ -1,6 +1,6 @@ using System; -namespace ApplicationCore.Entities.OrderAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate { public class Address // ValueObject { diff --git a/src/ApplicationCore/Entities/OrderAggregate/CatalogItemOrdered.cs b/src/ApplicationCore/Entities/OrderAggregate/CatalogItemOrdered.cs index 44df823..8daed9f 100644 --- a/src/ApplicationCore/Entities/OrderAggregate/CatalogItemOrdered.cs +++ b/src/ApplicationCore/Entities/OrderAggregate/CatalogItemOrdered.cs @@ -1,6 +1,6 @@ using Ardalis.GuardClauses; -namespace ApplicationCore.Entities.OrderAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate { /// /// Represents a snapshot of the item that was ordered. If catalog item details change, details of diff --git a/src/ApplicationCore/Entities/OrderAggregate/Order.cs b/src/ApplicationCore/Entities/OrderAggregate/Order.cs index 171bb65..c8be0f1 100644 --- a/src/ApplicationCore/Entities/OrderAggregate/Order.cs +++ b/src/ApplicationCore/Entities/OrderAggregate/Order.cs @@ -1,10 +1,10 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Ardalis.GuardClauses; using Microsoft.eShopWeb.ApplicationCore.Entities; using System; using System.Collections.Generic; -namespace ApplicationCore.Entities.OrderAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate { public class Order : BaseEntity, IAggregateRoot { diff --git a/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs b/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs index 773e3b1..5557791 100644 --- a/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs +++ b/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs @@ -1,6 +1,6 @@ using Microsoft.eShopWeb.ApplicationCore.Entities; -namespace ApplicationCore.Entities.OrderAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate { public class OrderItem : BaseEntity diff --git a/src/ApplicationCore/Exceptions/BasketNotFoundException.cs b/src/ApplicationCore/Exceptions/BasketNotFoundException.cs index 7a3f804..1e98888 100644 --- a/src/ApplicationCore/Exceptions/BasketNotFoundException.cs +++ b/src/ApplicationCore/Exceptions/BasketNotFoundException.cs @@ -1,6 +1,6 @@ using System; -namespace ApplicationCore.Exceptions +namespace Microsoft.eShopWeb.ApplicationCore.Exceptions { public class BasketNotFoundException : Exception { diff --git a/src/ApplicationCore/Exceptions/GuardExtensions.cs b/src/ApplicationCore/Exceptions/GuardExtensions.cs index 47c6508..2acbf00 100644 --- a/src/ApplicationCore/Exceptions/GuardExtensions.cs +++ b/src/ApplicationCore/Exceptions/GuardExtensions.cs @@ -1,4 +1,4 @@ -using ApplicationCore.Exceptions; +using Microsoft.eShopWeb.ApplicationCore.Exceptions; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; namespace Ardalis.GuardClauses diff --git a/src/ApplicationCore/Interfaces/IAggregateRoot.cs b/src/ApplicationCore/Interfaces/IAggregateRoot.cs index 84e3a15..5776e90 100644 --- a/src/ApplicationCore/Interfaces/IAggregateRoot.cs +++ b/src/ApplicationCore/Interfaces/IAggregateRoot.cs @@ -1,4 +1,4 @@ -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IAggregateRoot { } diff --git a/src/ApplicationCore/Interfaces/IAppLogger.cs b/src/ApplicationCore/Interfaces/IAppLogger.cs index 53036cd..578637f 100644 --- a/src/ApplicationCore/Interfaces/IAppLogger.cs +++ b/src/ApplicationCore/Interfaces/IAppLogger.cs @@ -1,4 +1,4 @@ -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { /// /// This type eliminates the need to depend directly on the ASP.NET Core logging types. diff --git a/src/ApplicationCore/Interfaces/IAsyncRepository.cs b/src/ApplicationCore/Interfaces/IAsyncRepository.cs index 9bbcefd..dac6b14 100644 --- a/src/ApplicationCore/Interfaces/IAsyncRepository.cs +++ b/src/ApplicationCore/Interfaces/IAsyncRepository.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IAsyncRepository where T : BaseEntity { diff --git a/src/ApplicationCore/Interfaces/IBasketService.cs b/src/ApplicationCore/Interfaces/IBasketService.cs index 7be1a9d..2477078 100644 --- a/src/ApplicationCore/Interfaces/IBasketService.cs +++ b/src/ApplicationCore/Interfaces/IBasketService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IBasketService { diff --git a/src/ApplicationCore/Interfaces/IEmailSender.cs b/src/ApplicationCore/Interfaces/IEmailSender.cs index f831c73..722f8e4 100644 --- a/src/ApplicationCore/Interfaces/IEmailSender.cs +++ b/src/ApplicationCore/Interfaces/IEmailSender.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IEmailSender diff --git a/src/ApplicationCore/Interfaces/IIdentityParser.cs b/src/ApplicationCore/Interfaces/IIdentityParser.cs index 3b8e746..edc79b0 100644 --- a/src/ApplicationCore/Interfaces/IIdentityParser.cs +++ b/src/ApplicationCore/Interfaces/IIdentityParser.cs @@ -1,6 +1,6 @@ using System.Security.Principal; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IIdentityParser { diff --git a/src/ApplicationCore/Interfaces/IOrderRepository.cs b/src/ApplicationCore/Interfaces/IOrderRepository.cs index 8eb9713..6469cf0 100644 --- a/src/ApplicationCore/Interfaces/IOrderRepository.cs +++ b/src/ApplicationCore/Interfaces/IOrderRepository.cs @@ -1,7 +1,7 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System.Threading.Tasks; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IOrderRepository : IRepository, IAsyncRepository diff --git a/src/ApplicationCore/Interfaces/IOrderService.cs b/src/ApplicationCore/Interfaces/IOrderService.cs index 3c37ab1..feb0cd5 100644 --- a/src/ApplicationCore/Interfaces/IOrderService.cs +++ b/src/ApplicationCore/Interfaces/IOrderService.cs @@ -1,7 +1,7 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System.Threading.Tasks; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IOrderService { diff --git a/src/ApplicationCore/Interfaces/IRepository.cs b/src/ApplicationCore/Interfaces/IRepository.cs index 9099188..6d56ec1 100644 --- a/src/ApplicationCore/Interfaces/IRepository.cs +++ b/src/ApplicationCore/Interfaces/IRepository.cs @@ -1,7 +1,7 @@ using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Collections.Generic; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IRepository where T : BaseEntity { diff --git a/src/ApplicationCore/Interfaces/ISpecification.cs b/src/ApplicationCore/Interfaces/ISpecification.cs index f9a2167..27e388f 100644 --- a/src/ApplicationCore/Interfaces/ISpecification.cs +++ b/src/ApplicationCore/Interfaces/ISpecification.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq.Expressions; -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface ISpecification { diff --git a/src/ApplicationCore/Interfaces/IUriComposer.cs b/src/ApplicationCore/Interfaces/IUriComposer.cs index ccd7812..ee2263c 100644 --- a/src/ApplicationCore/Interfaces/IUriComposer.cs +++ b/src/ApplicationCore/Interfaces/IUriComposer.cs @@ -1,4 +1,4 @@ -namespace ApplicationCore.Interfaces +namespace Microsoft.eShopWeb.ApplicationCore.Interfaces { public interface IUriComposer { diff --git a/src/ApplicationCore/Services/BasketService.cs b/src/ApplicationCore/Services/BasketService.cs index 93be695..e31bbf9 100644 --- a/src/ApplicationCore/Services/BasketService.cs +++ b/src/ApplicationCore/Services/BasketService.cs @@ -1,13 +1,13 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Threading.Tasks; using System.Collections.Generic; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Linq; using Ardalis.GuardClauses; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; -namespace ApplicationCore.Services +namespace Microsoft.eShopWeb.ApplicationCore.Services { public class BasketService : IBasketService { diff --git a/src/ApplicationCore/Services/OrderService.cs b/src/ApplicationCore/Services/OrderService.cs index 0c9373b..01cd3a4 100644 --- a/src/ApplicationCore/Services/OrderService.cs +++ b/src/ApplicationCore/Services/OrderService.cs @@ -1,12 +1,12 @@ -using ApplicationCore.Interfaces; -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System.Threading.Tasks; using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Collections.Generic; using Ardalis.GuardClauses; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; -namespace ApplicationCore.Services +namespace Microsoft.eShopWeb.ApplicationCore.Services { public class OrderService : IOrderService { diff --git a/src/ApplicationCore/Services/UriComposer.cs b/src/ApplicationCore/Services/UriComposer.cs index 14f73f2..cf312b3 100644 --- a/src/ApplicationCore/Services/UriComposer.cs +++ b/src/ApplicationCore/Services/UriComposer.cs @@ -1,7 +1,7 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.eShopWeb; -namespace ApplicationCore.Services +namespace Microsoft.eShopWeb.ApplicationCore.Services { public class UriComposer : IUriComposer { diff --git a/src/ApplicationCore/Specifications/BaseSpecification.cs b/src/ApplicationCore/Specifications/BaseSpecification.cs index 4194cc4..beaa21c 100644 --- a/src/ApplicationCore/Specifications/BaseSpecification.cs +++ b/src/ApplicationCore/Specifications/BaseSpecification.cs @@ -1,9 +1,9 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System; using System.Linq.Expressions; using System.Collections.Generic; -namespace ApplicationCore.Specifications +namespace Microsoft.eShopWeb.ApplicationCore.Specifications { public abstract class BaseSpecification : ISpecification { diff --git a/src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs b/src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs index c18aa3b..7860862 100644 --- a/src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs +++ b/src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs @@ -1,7 +1,7 @@ using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; -namespace ApplicationCore.Specifications +namespace Microsoft.eShopWeb.ApplicationCore.Specifications { public sealed class BasketWithItemsSpecification : BaseSpecification { diff --git a/src/ApplicationCore/Specifications/CatalogFilterSpecification.cs b/src/ApplicationCore/Specifications/CatalogFilterSpecification.cs index efcba8c..2d67be1 100644 --- a/src/ApplicationCore/Specifications/CatalogFilterSpecification.cs +++ b/src/ApplicationCore/Specifications/CatalogFilterSpecification.cs @@ -1,6 +1,6 @@ using Microsoft.eShopWeb.ApplicationCore.Entities; -namespace ApplicationCore.Specifications +namespace Microsoft.eShopWeb.ApplicationCore.Specifications { public class CatalogFilterSpecification : BaseSpecification diff --git a/src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs b/src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs index 1c81296..d49b78a 100644 --- a/src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs +++ b/src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs @@ -1,6 +1,6 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; -namespace ApplicationCore.Specifications +namespace Microsoft.eShopWeb.ApplicationCore.Specifications { public class CustomerOrdersWithItemsSpecification : BaseSpecification { diff --git a/src/Infrastructure/Data/CatalogContext.cs b/src/Infrastructure/Data/CatalogContext.cs index d66ed36..e4b5d17 100644 --- a/src/Infrastructure/Data/CatalogContext.cs +++ b/src/Infrastructure/Data/CatalogContext.cs @@ -1,10 +1,10 @@ -using ApplicationCore.Entities.OrderAggregate; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; -namespace Infrastructure.Data +namespace Microsoft.eShopWeb.Infrastructure.Data { public class CatalogContext : DbContext diff --git a/src/Infrastructure/Data/CatalogContextSeed.cs b/src/Infrastructure/Data/CatalogContextSeed.cs index c0abbf5..24c4b8b 100644 --- a/src/Infrastructure/Data/CatalogContextSeed.cs +++ b/src/Infrastructure/Data/CatalogContextSeed.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Infrastructure.Data +namespace Microsoft.eShopWeb.Infrastructure.Data { public class CatalogContextSeed { diff --git a/src/Infrastructure/Data/EfRepository.cs b/src/Infrastructure/Data/EfRepository.cs index 47fe8a2..968d4c1 100644 --- a/src/Infrastructure/Data/EfRepository.cs +++ b/src/Infrastructure/Data/EfRepository.cs @@ -1,11 +1,11 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.EntityFrameworkCore; using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Infrastructure.Data +namespace Microsoft.eShopWeb.Infrastructure.Data { /// /// "There's some repetition here - couldn't we have some the sync methods call the async?" diff --git a/src/Infrastructure/Data/Migrations/20171018175735_Initial.Designer.cs b/src/Infrastructure/Data/Migrations/20171018175735_Initial.Designer.cs index 6ccc716..c15236d 100644 --- a/src/Infrastructure/Data/Migrations/20171018175735_Initial.Designer.cs +++ b/src/Infrastructure/Data/Migrations/20171018175735_Initial.Designer.cs @@ -1,5 +1,5 @@ // -using Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.Internal; using System; -namespace Infrastructure.Data.Migrations +namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations { [DbContext(typeof(CatalogContext))] [Migration("20171018175735_Initial")] diff --git a/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs b/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs index b477066..e971ac8 100644 --- a/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs +++ b/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using System; using System.Collections.Generic; -namespace Infrastructure.Data.Migrations +namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations { public partial class Initial : Migration { diff --git a/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs b/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs index 425bc05..da98574 100644 --- a/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs +++ b/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs @@ -1,5 +1,5 @@ // -using Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.Internal; using System; -namespace Infrastructure.Data.Migrations +namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations { [DbContext(typeof(CatalogContext))] partial class CatalogContextModelSnapshot : ModelSnapshot diff --git a/src/Infrastructure/Data/OrderRepository.cs b/src/Infrastructure/Data/OrderRepository.cs index 020fe47..23f92d7 100644 --- a/src/Infrastructure/Data/OrderRepository.cs +++ b/src/Infrastructure/Data/OrderRepository.cs @@ -1,10 +1,10 @@ -using ApplicationCore.Entities.OrderAggregate; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.EntityFrameworkCore; using System.Linq; using System.Threading.Tasks; -namespace Infrastructure.Data +namespace Microsoft.eShopWeb.Infrastructure.Data { public class OrderRepository : EfRepository, IOrderRepository { diff --git a/src/Infrastructure/Identity/AppIdentityDbContext.cs b/src/Infrastructure/Identity/AppIdentityDbContext.cs index b90d951..3fa8f62 100644 --- a/src/Infrastructure/Identity/AppIdentityDbContext.cs +++ b/src/Infrastructure/Identity/AppIdentityDbContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; -namespace Infrastructure.Identity +namespace Microsoft.eShopWeb.Infrastructure.Identity { public class AppIdentityDbContext : IdentityDbContext { diff --git a/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs b/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs index a0663b9..cb0a6b3 100644 --- a/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs +++ b/src/Infrastructure/Identity/AppIdentityDbContextSeed.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Identity; using System.Threading.Tasks; -namespace Infrastructure.Identity +namespace Microsoft.eShopWeb.Infrastructure.Identity { public class AppIdentityDbContextSeed { diff --git a/src/Infrastructure/Identity/ApplicationUser.cs b/src/Infrastructure/Identity/ApplicationUser.cs index adb93e3..9b87155 100644 --- a/src/Infrastructure/Identity/ApplicationUser.cs +++ b/src/Infrastructure/Identity/ApplicationUser.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace Infrastructure.Identity +namespace Microsoft.eShopWeb.Infrastructure.Identity { public class ApplicationUser : IdentityUser { diff --git a/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.Designer.cs b/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.Designer.cs index 7948c6f..ebf9e22 100644 --- a/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.Designer.cs +++ b/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.Designer.cs @@ -3,9 +3,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; -namespace Infrastructure.Identity.Migrations +namespace Microsoft.eShopWeb.Infrastructure.Identity.Migrations { [DbContext(typeof(AppIdentityDbContext))] [Migration("20170822214310_InitialIdentityModel")] diff --git a/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs b/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs index 0ab21dd..6c146e7 100644 --- a/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs +++ b/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Metadata; -namespace Infrastructure.Identity.Migrations +namespace Microsoft.eShopWeb.Infrastructure.Identity.Migrations { public partial class InitialIdentityModel : Migration { diff --git a/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs b/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs index 5f56ae8..fffdaac 100644 --- a/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs +++ b/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs @@ -3,9 +3,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; -namespace Infrastructure.Identity.Migrations +namespace Microsoft.eShopWeb.Infrastructure.Identity.Migrations { [DbContext(typeof(AppIdentityDbContext))] partial class AppIdentityDbContextModelSnapshot : ModelSnapshot diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index e051c33..0259dc6 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -2,6 +2,7 @@ netstandard2.0 + Microsoft.eShopWeb.Infrastructure diff --git a/src/Infrastructure/Logging/LoggerAdapter.cs b/src/Infrastructure/Logging/LoggerAdapter.cs index 240c5b1..aea77e6 100644 --- a/src/Infrastructure/Logging/LoggerAdapter.cs +++ b/src/Infrastructure/Logging/LoggerAdapter.cs @@ -1,7 +1,7 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.Extensions.Logging; -namespace Infrastructure.Logging +namespace Microsoft.eShopWeb.Infrastructure.Logging { public class LoggerAdapter : IAppLogger { diff --git a/src/Infrastructure/Services/EmailSender.cs b/src/Infrastructure/Services/EmailSender.cs index 979ca73..c6850c7 100644 --- a/src/Infrastructure/Services/EmailSender.cs +++ b/src/Infrastructure/Services/EmailSender.cs @@ -1,7 +1,7 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Threading.Tasks; -namespace Infrastructure.Services +namespace Microsoft.eShopWeb.Infrastructure.Services { // This class is used by the application to send email for account confirmation and password reset. // For more details see https://go.microsoft.com/fwlink/?LinkID=532713 diff --git a/src/Web/Constants.cs b/src/Web/Constants.cs index cb9f96b..fbc5855 100644 --- a/src/Web/Constants.cs +++ b/src/Web/Constants.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb +namespace Microsoft.eShopWeb.Web { public static class Constants { diff --git a/src/Web/Controllers/AccountController.cs b/src/Web/Controllers/AccountController.cs index 185a82c..606f2b2 100644 --- a/src/Web/Controllers/AccountController.cs +++ b/src/Web/Controllers/AccountController.cs @@ -1,15 +1,14 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using Microsoft.eShopWeb.ViewModels.Account; +using Microsoft.eShopWeb.Web.ViewModels.Account; using System; using System.Threading.Tasks; -using Web.ViewModels.Account; -namespace Microsoft.eShopWeb.Controllers +namespace Microsoft.eShopWeb.Web.Controllers { [Route("[controller]/[action]")] diff --git a/src/Web/Controllers/Api/BaseApiController.cs b/src/Web/Controllers/Api/BaseApiController.cs index a268500..3d0bb2d 100644 --- a/src/Web/Controllers/Api/BaseApiController.cs +++ b/src/Web/Controllers/Api/BaseApiController.cs @@ -1,8 +1,8 @@ -using Microsoft.eShopWeb.Services; +using Microsoft.eShopWeb.Web.Services; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Controllers.Api +namespace Microsoft.eShopWeb.Web.Controllers.Api { [Route("api/[controller]/[action]")] public class BaseApiController : Controller diff --git a/src/Web/Controllers/Api/CatalogController.cs b/src/Web/Controllers/Api/CatalogController.cs index 849e576..1adc783 100644 --- a/src/Web/Controllers/Api/CatalogController.cs +++ b/src/Web/Controllers/Api/CatalogController.cs @@ -1,8 +1,8 @@ -using Microsoft.eShopWeb.Services; +using Microsoft.eShopWeb.Web.Services; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Controllers.Api +namespace Microsoft.eShopWeb.Web.Controllers.Api { public class CatalogController : BaseApiController { diff --git a/src/Web/Controllers/BasketController.cs b/src/Web/Controllers/BasketController.cs index c2572f0..97fdf43 100644 --- a/src/Web/Controllers/BasketController.cs +++ b/src/Web/Controllers/BasketController.cs @@ -1,17 +1,17 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.AspNetCore.Http; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.ViewModels; using Microsoft.AspNetCore.Identity; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using System; using System.Collections.Generic; -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using Microsoft.AspNetCore.Authorization; -using Microsoft.eShopWeb.Interfaces; +using Microsoft.eShopWeb.Web.Interfaces; -namespace Microsoft.eShopWeb.Controllers +namespace Microsoft.eShopWeb.Web.Controllers { [Route("[controller]/[action]")] public class BasketController : Controller diff --git a/src/Web/Controllers/CatalogController.cs b/src/Web/Controllers/CatalogController.cs index de7475b..d7fa4b5 100644 --- a/src/Web/Controllers/CatalogController.cs +++ b/src/Web/Controllers/CatalogController.cs @@ -1,8 +1,8 @@ -using Microsoft.eShopWeb.Services; +using Microsoft.eShopWeb.Web.Services; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Controllers +namespace Microsoft.eShopWeb.Web.Controllers { [Route("")] public class CatalogController : Controller diff --git a/src/Web/Controllers/ManageController.cs b/src/Web/Controllers/ManageController.cs index dd77c0a..ff21d58 100644 --- a/src/Web/Controllers/ManageController.cs +++ b/src/Web/Controllers/ManageController.cs @@ -1,18 +1,18 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using Microsoft.eShopWeb.ViewModels.Manage; -using Microsoft.eShopWeb.Services; +using Microsoft.eShopWeb.Web.ViewModels.Manage; +using Microsoft.eShopWeb.Web.Services; using System; using System.Linq; using System.Text; using System.Text.Encodings.Web; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Controllers +namespace Microsoft.eShopWeb.Web.Controllers { [Authorize] [Route("[controller]/[action]")] diff --git a/src/Web/Controllers/OrderController.cs b/src/Web/Controllers/OrderController.cs index db083f5..c8f0e07 100644 --- a/src/Web/Controllers/OrderController.cs +++ b/src/Web/Controllers/OrderController.cs @@ -1,14 +1,14 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.ViewModels; using System; -using ApplicationCore.Entities.OrderAggregate; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Linq; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Specifications; -namespace Microsoft.eShopWeb.Controllers +namespace Microsoft.eShopWeb.Web.Controllers { [Authorize] [Route("[controller]/[action]")] diff --git a/src/Web/Extensions/EmailSenderExtensions.cs b/src/Web/Extensions/EmailSenderExtensions.cs index 28a2ac4..b3bb93c 100644 --- a/src/Web/Extensions/EmailSenderExtensions.cs +++ b/src/Web/Extensions/EmailSenderExtensions.cs @@ -1,8 +1,8 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Text.Encodings.Web; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Services +namespace Microsoft.eShopWeb.Web.Services { public static class EmailSenderExtensions { diff --git a/src/Web/Extensions/UrlHelperExtensions.cs b/src/Web/Extensions/UrlHelperExtensions.cs index 02d47f8..95d971a 100644 --- a/src/Web/Extensions/UrlHelperExtensions.cs +++ b/src/Web/Extensions/UrlHelperExtensions.cs @@ -1,4 +1,4 @@ -using Microsoft.eShopWeb.Controllers; +using Microsoft.eShopWeb.Web.Controllers; namespace Microsoft.AspNetCore.Mvc { diff --git a/src/Web/Interfaces/IBasketService.cs b/src/Web/Interfaces/IBasketService.cs index 4bdf2ed..7a5c845 100644 --- a/src/Web/Interfaces/IBasketService.cs +++ b/src/Web/Interfaces/IBasketService.cs @@ -1,7 +1,7 @@ -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.ViewModels; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Interfaces +namespace Microsoft.eShopWeb.Web.Interfaces { public interface IBasketViewModelService { diff --git a/src/Web/Interfaces/ICatalogService.cs b/src/Web/Interfaces/ICatalogService.cs index 1c3e333..82765f5 100644 --- a/src/Web/Interfaces/ICatalogService.cs +++ b/src/Web/Interfaces/ICatalogService.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.ViewModels; using System.Collections.Generic; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Services +namespace Microsoft.eShopWeb.Web.Services { public interface ICatalogService { diff --git a/src/Web/Program.cs b/src/Web/Program.cs index cd6c478..9629b8f 100644 --- a/src/Web/Program.cs +++ b/src/Web/Program.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore; using Microsoft.Extensions.DependencyInjection; -using Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Data; using System; using Microsoft.Extensions.Logging; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; -namespace Microsoft.eShopWeb +namespace Microsoft.eShopWeb.Web { public class Program { diff --git a/src/Web/Services/BasketViewModelService.cs b/src/Web/Services/BasketViewModelService.cs index 4ff0479..7aa9b9a 100644 --- a/src/Web/Services/BasketViewModelService.cs +++ b/src/Web/Services/BasketViewModelService.cs @@ -1,14 +1,14 @@ -using ApplicationCore.Interfaces; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; -using Microsoft.eShopWeb.Interfaces; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.Interfaces; +using Microsoft.eShopWeb.Web.ViewModels; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.eShopWeb.Services +namespace Microsoft.eShopWeb.Web.Services { public class BasketViewModelService : IBasketViewModelService { diff --git a/src/Web/Services/CachedCatalogService.cs b/src/Web/Services/CachedCatalogService.cs index b2cae61..94e513d 100644 --- a/src/Web/Services/CachedCatalogService.cs +++ b/src/Web/Services/CachedCatalogService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.ViewModels; using Microsoft.Extensions.Caching.Memory; using System; -namespace Microsoft.eShopWeb.Services +namespace Microsoft.eShopWeb.Web.Services { public class CachedCatalogService : ICatalogService { diff --git a/src/Web/Services/CatalogService.cs b/src/Web/Services/CatalogService.cs index bf68834..e24794b 100644 --- a/src/Web/Services/CatalogService.cs +++ b/src/Web/Services/CatalogService.cs @@ -2,14 +2,14 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.ViewModels; using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.Extensions.Logging; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Specifications; -namespace Microsoft.eShopWeb.Services +namespace Microsoft.eShopWeb.Web.Services { /// /// This is a UI-specific service so belongs in UI project. It does not contain any business logic and works diff --git a/src/Web/Startup.cs b/src/Web/Startup.cs index 50bd7da..e6ee913 100644 --- a/src/Web/Startup.cs +++ b/src/Web/Startup.cs @@ -1,22 +1,22 @@ -using ApplicationCore.Interfaces; -using ApplicationCore.Services; -using Infrastructure.Data; -using Infrastructure.Identity; -using Infrastructure.Logging; -using Infrastructure.Services; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Services; +using Microsoft.eShopWeb.Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Logging; +using Microsoft.eShopWeb.Infrastructure.Services; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -using Microsoft.eShopWeb.Interfaces; -using Microsoft.eShopWeb.Services; +using Microsoft.eShopWeb.Web.Interfaces; +using Microsoft.eShopWeb.Web.Services; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using System; using System.Text; -namespace Microsoft.eShopWeb +namespace Microsoft.eShopWeb.Web { public class Startup { diff --git a/src/Web/ViewComponents/Basket.cs b/src/Web/ViewComponents/Basket.cs index 0c0038e..9cfa0e1 100644 --- a/src/Web/ViewComponents/Basket.cs +++ b/src/Web/ViewComponents/Basket.cs @@ -1,14 +1,14 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.eShopWeb; -using Microsoft.eShopWeb.Interfaces; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web.Interfaces; +using Microsoft.eShopWeb.Web.ViewModels; using System.Linq; using System.Threading.Tasks; -namespace Web.ViewComponents +namespace Microsoft.eShopWeb.Web.ViewComponents { public class Basket : ViewComponent { diff --git a/src/Web/ViewModels/Account/LoginViewModel.cs b/src/Web/ViewModels/Account/LoginViewModel.cs index 72ddabc..5945e88 100644 --- a/src/Web/ViewModels/Account/LoginViewModel.cs +++ b/src/Web/ViewModels/Account/LoginViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Account +namespace Microsoft.eShopWeb.Web.ViewModels.Account { public class LoginViewModel { diff --git a/src/Web/ViewModels/Account/LoginWith2faViewModel.cs b/src/Web/ViewModels/Account/LoginWith2faViewModel.cs index 640fe15..24985c8 100644 --- a/src/Web/ViewModels/Account/LoginWith2faViewModel.cs +++ b/src/Web/ViewModels/Account/LoginWith2faViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Account +namespace Microsoft.eShopWeb.Web.ViewModels.Account { public class LoginWith2faViewModel { diff --git a/src/Web/ViewModels/Account/RegisterViewModel.cs b/src/Web/ViewModels/Account/RegisterViewModel.cs index ae17369..0d89911 100644 --- a/src/Web/ViewModels/Account/RegisterViewModel.cs +++ b/src/Web/ViewModels/Account/RegisterViewModel.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Account +namespace Microsoft.eShopWeb.Web.ViewModels.Account { public class RegisterViewModel { diff --git a/src/Web/ViewModels/Account/ResetPasswordViewModel.cs b/src/Web/ViewModels/Account/ResetPasswordViewModel.cs index bf1a9b3..49c2ac7 100644 --- a/src/Web/ViewModels/Account/ResetPasswordViewModel.cs +++ b/src/Web/ViewModels/Account/ResetPasswordViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Web.ViewModels.Account +namespace Microsoft.eShopWeb.Web.ViewModels.Account { public class ResetPasswordViewModel { diff --git a/src/Web/ViewModels/BasketComponentViewModel.cs b/src/Web/ViewModels/BasketComponentViewModel.cs index 56725a5..bd9cbcc 100644 --- a/src/Web/ViewModels/BasketComponentViewModel.cs +++ b/src/Web/ViewModels/BasketComponentViewModel.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class BasketComponentViewModel { diff --git a/src/Web/ViewModels/BasketItemViewModel.cs b/src/Web/ViewModels/BasketItemViewModel.cs index 03f6849..5f74436 100644 --- a/src/Web/ViewModels/BasketItemViewModel.cs +++ b/src/Web/ViewModels/BasketItemViewModel.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class BasketItemViewModel { diff --git a/src/Web/ViewModels/BasketViewModel.cs b/src/Web/ViewModels/BasketViewModel.cs index f0c2892..901bef9 100644 --- a/src/Web/ViewModels/BasketViewModel.cs +++ b/src/Web/ViewModels/BasketViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class BasketViewModel { diff --git a/src/Web/ViewModels/CatalogIndexViewModel.cs b/src/Web/ViewModels/CatalogIndexViewModel.cs index 7f321c2..8715e1d 100644 --- a/src/Web/ViewModels/CatalogIndexViewModel.cs +++ b/src/Web/ViewModels/CatalogIndexViewModel.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using System.Collections.Generic; -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class CatalogIndexViewModel { diff --git a/src/Web/ViewModels/CatalogItemViewModel.cs b/src/Web/ViewModels/CatalogItemViewModel.cs index 04123e3..5105b72 100644 --- a/src/Web/ViewModels/CatalogItemViewModel.cs +++ b/src/Web/ViewModels/CatalogItemViewModel.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class CatalogItemViewModel { diff --git a/src/Web/ViewModels/Manage/ChangePasswordViewModel.cs b/src/Web/ViewModels/Manage/ChangePasswordViewModel.cs index 81e7f06..0e32c23 100644 --- a/src/Web/ViewModels/Manage/ChangePasswordViewModel.cs +++ b/src/Web/ViewModels/Manage/ChangePasswordViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class ChangePasswordViewModel { diff --git a/src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs b/src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs index fffad4a..eafeea8 100644 --- a/src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs +++ b/src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class EnableAuthenticatorViewModel { diff --git a/src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs b/src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs index 3187d7d..5b64a81 100644 --- a/src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs +++ b/src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Identity; using System.Collections.Generic; -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class ExternalLoginsViewModel { diff --git a/src/Web/ViewModels/Manage/GenerateRecoveryCodesViewModel.cs b/src/Web/ViewModels/Manage/GenerateRecoveryCodesViewModel.cs index 2809726..0537a8f 100644 --- a/src/Web/ViewModels/Manage/GenerateRecoveryCodesViewModel.cs +++ b/src/Web/ViewModels/Manage/GenerateRecoveryCodesViewModel.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class GenerateRecoveryCodesViewModel { diff --git a/src/Web/ViewModels/Manage/IndexViewModel.cs b/src/Web/ViewModels/Manage/IndexViewModel.cs index a5a2ee0..ac35486 100644 --- a/src/Web/ViewModels/Manage/IndexViewModel.cs +++ b/src/Web/ViewModels/Manage/IndexViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class IndexViewModel { diff --git a/src/Web/ViewModels/Manage/RemoveLoginViewModel.cs b/src/Web/ViewModels/Manage/RemoveLoginViewModel.cs index f5a9b03..bf0395d 100644 --- a/src/Web/ViewModels/Manage/RemoveLoginViewModel.cs +++ b/src/Web/ViewModels/Manage/RemoveLoginViewModel.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class RemoveLoginViewModel { diff --git a/src/Web/ViewModels/Manage/SetPasswordViewModel.cs b/src/Web/ViewModels/Manage/SetPasswordViewModel.cs index 4e74b8f..0c26739 100644 --- a/src/Web/ViewModels/Manage/SetPasswordViewModel.cs +++ b/src/Web/ViewModels/Manage/SetPasswordViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class SetPasswordViewModel { diff --git a/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs b/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs index 840da34..c281a39 100644 --- a/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs +++ b/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels.Manage +namespace Microsoft.eShopWeb.Web.ViewModels.Manage { public class TwoFactorAuthenticationViewModel { diff --git a/src/Web/ViewModels/OrderItemViewModel.cs b/src/Web/ViewModels/OrderItemViewModel.cs index a1b0437..13022d8 100644 --- a/src/Web/ViewModels/OrderItemViewModel.cs +++ b/src/Web/ViewModels/OrderItemViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class OrderItemViewModel { diff --git a/src/Web/ViewModels/OrderViewModel.cs b/src/Web/ViewModels/OrderViewModel.cs index 1663d16..e4cdad1 100644 --- a/src/Web/ViewModels/OrderViewModel.cs +++ b/src/Web/ViewModels/OrderViewModel.cs @@ -1,8 +1,8 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System; using System.Collections.Generic; -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class OrderViewModel { diff --git a/src/Web/ViewModels/PaginationInfoViewModel.cs b/src/Web/ViewModels/PaginationInfoViewModel.cs index 89e90b4..142d922 100644 --- a/src/Web/ViewModels/PaginationInfoViewModel.cs +++ b/src/Web/ViewModels/PaginationInfoViewModel.cs @@ -1,4 +1,4 @@ -namespace Microsoft.eShopWeb.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class PaginationInfoViewModel { diff --git a/src/Web/Views/Account/LoginWith2fa.cshtml b/src/Web/Views/Account/LoginWith2fa.cshtml index 39f4443..2e52d37 100644 --- a/src/Web/Views/Account/LoginWith2fa.cshtml +++ b/src/Web/Views/Account/LoginWith2fa.cshtml @@ -1,3 +1,4 @@ +@using Microsoft.eShopWeb.Web.ViewModels.Account @model LoginWith2faViewModel @{ ViewData["Title"] = "Two-factor authentication"; diff --git a/src/Web/Views/Account/Register.cshtml b/src/Web/Views/Account/Register.cshtml index 85a0668..188ca5f 100644 --- a/src/Web/Views/Account/Register.cshtml +++ b/src/Web/Views/Account/Register.cshtml @@ -1,55 +1,56 @@ @using System.Collections.Generic @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Authentication +@using Microsoft.eShopWeb.Web.ViewModels.Account @model RegisterViewModel @{ ViewData["Title"] = "Register"; } -
-
    -
  • Already have an account? LOGIN
    • -
-
- - @section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } - } +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/Web/Views/Account/Signin.cshtml b/src/Web/Views/Account/Signin.cshtml index 902c6f5..7c88be0 100644 --- a/src/Web/Views/Account/Signin.cshtml +++ b/src/Web/Views/Account/Signin.cshtml @@ -1,60 +1,60 @@ -@using Microsoft.eShopWeb.ViewModels.Account +@using Microsoft.eShopWeb.Web.ViewModels.Account @model LoginViewModel @{ ViewData["Title"] = "Log in"; } -
- -
- - @section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } - } +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/Web/Views/Basket/Checkout.cshtml b/src/Web/Views/Basket/Checkout.cshtml index b0e061f..3cc3d86 100644 --- a/src/Web/Views/Basket/Checkout.cshtml +++ b/src/Web/Views/Basket/Checkout.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.eShopWeb.ViewModels +@using Microsoft.eShopWeb.Web.ViewModels @{ ViewData["Title"] = "Checkout Complete"; @model BasketViewModel diff --git a/src/Web/Views/Basket/Index.cshtml b/src/Web/Views/Basket/Index.cshtml index 0c8a977..17e0ecf 100644 --- a/src/Web/Views/Basket/Index.cshtml +++ b/src/Web/Views/Basket/Index.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.eShopWeb.ViewModels +@using Microsoft.eShopWeb.Web.ViewModels @model BasketViewModel @{ ViewData["Title"] = "Basket"; diff --git a/src/Web/Views/Manage/ManageNavPages.cs b/src/Web/Views/Manage/ManageNavPages.cs index 585d17e..5f15b0d 100644 --- a/src/Web/Views/Manage/ManageNavPages.cs +++ b/src/Web/Views/Manage/ManageNavPages.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -namespace Microsoft.eShopWeb.Views.Manage +namespace Microsoft.eShopWeb.Web.Views.Manage { public static class ManageNavPages { diff --git a/src/Web/Views/Manage/_ViewImports.cshtml b/src/Web/Views/Manage/_ViewImports.cshtml index 2b83661..4d9e13f 100644 --- a/src/Web/Views/Manage/_ViewImports.cshtml +++ b/src/Web/Views/Manage/_ViewImports.cshtml @@ -1 +1 @@ -@using Microsoft.eShopWeb.Views.Manage \ No newline at end of file +@using Microsoft.eShopWeb.Web.Views.Manage \ No newline at end of file diff --git a/src/Web/Views/Order/Detail.cshtml b/src/Web/Views/Order/Detail.cshtml index 9cc7656..1eacdef 100644 --- a/src/Web/Views/Order/Detail.cshtml +++ b/src/Web/Views/Order/Detail.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.eShopWeb.ViewModels +@using Microsoft.eShopWeb.Web.ViewModels @model OrderViewModel @{ ViewData["Title"] = "My Order History"; diff --git a/src/Web/Views/Order/Index.cshtml b/src/Web/Views/Order/Index.cshtml index 838ff58..b35e00a 100644 --- a/src/Web/Views/Order/Index.cshtml +++ b/src/Web/Views/Order/Index.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.eShopWeb.ViewModels +@using Microsoft.eShopWeb.Web.ViewModels @model IEnumerable @{ ViewData["Title"] = "My Order History"; diff --git a/src/Web/Views/_ViewImports.cshtml b/src/Web/Views/_ViewImports.cshtml index ca9578b..fa5c648 100644 --- a/src/Web/Views/_ViewImports.cshtml +++ b/src/Web/Views/_ViewImports.cshtml @@ -1,7 +1,7 @@ -@using Microsoft.eShopWeb -@using Microsoft.eShopWeb.ViewModels -@using Microsoft.eShopWeb.ViewModels.Account -@using Microsoft.eShopWeb.ViewModels.Manage +@using Microsoft.eShopWeb.Web +@using Microsoft.eShopWeb.Web.ViewModels +@using Microsoft.eShopWeb.Web.ViewModels.Account +@using Microsoft.eShopWeb.Web.ViewModels.Manage @using Microsoft.AspNetCore.Identity -@using Infrastructure.Identity -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@using Microsoft.eShopWeb.Infrastructure.Identity +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index 19d0d3f..58ac383 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -2,6 +2,7 @@ netcoreapp2.1 + Microsoft.eShopWeb.Web diff --git a/src/WebRazorPages/Controllers/AccountController.cs b/src/WebRazorPages/Controllers/AccountController.cs index e394f91..bbc86f4 100644 --- a/src/WebRazorPages/Controllers/AccountController.cs +++ b/src/WebRazorPages/Controllers/AccountController.cs @@ -1,5 +1,5 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; diff --git a/src/WebRazorPages/Extensions/EmailSenderExtensions.cs b/src/WebRazorPages/Extensions/EmailSenderExtensions.cs index 46af85f..3a83e78 100644 --- a/src/WebRazorPages/Extensions/EmailSenderExtensions.cs +++ b/src/WebRazorPages/Extensions/EmailSenderExtensions.cs @@ -1,4 +1,4 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Text.Encodings.Web; using System.Threading.Tasks; diff --git a/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml.cs b/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml.cs index c46e971..ae83c3f 100644 --- a/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/LoginWith2fa.cshtml.cs @@ -1,5 +1,5 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml.cs index 4dc66f1..0fbb785 100644 --- a/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml.cs @@ -1,5 +1,5 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml.cs index 140ef94..971ab99 100644 --- a/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/ChangePassword.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/Disable2fa.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/Disable2fa.cshtml.cs index fd3eda7..ebbce7e 100644 --- a/src/WebRazorPages/Pages/Account/Manage/Disable2fa.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/Disable2fa.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml.cs index 9ce12bd..1aa7ada 100644 --- a/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/EnableAuthenticator.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs index 2bcc9bc..b5aa6c8 100644 --- a/src/WebRazorPages/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/Index.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/Index.cshtml.cs index a50bda6..ebf0ef4 100644 --- a/src/WebRazorPages/Pages/Account/Manage/Index.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/Index.cshtml.cs @@ -1,5 +1,5 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/ResetAuthenticator.cshtml.cs index 6128e44..9dff484 100644 --- a/src/WebRazorPages/Pages/Account/Manage/ResetAuthenticator.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/ResetAuthenticator.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml.cs index 9a459e4..12c3962 100644 --- a/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/SetPassword.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs index c3e5b6a..b016d91 100644 --- a/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Register.cshtml.cs b/src/WebRazorPages/Pages/Account/Register.cshtml.cs index 5571f77..475fa53 100644 --- a/src/WebRazorPages/Pages/Account/Register.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Register.cshtml.cs @@ -1,4 +1,4 @@ -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/WebRazorPages/Pages/Account/Signin.cshtml.cs b/src/WebRazorPages/Pages/Account/Signin.cshtml.cs index 2996951..eff34d0 100644 --- a/src/WebRazorPages/Pages/Account/Signin.cshtml.cs +++ b/src/WebRazorPages/Pages/Account/Signin.cshtml.cs @@ -2,11 +2,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Identity; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Authentication; using System; using System.ComponentModel.DataAnnotations; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; namespace Microsoft.eShopWeb.RazorPages.Pages.Account { diff --git a/src/WebRazorPages/Pages/Basket/Checkout.cshtml.cs b/src/WebRazorPages/Pages/Basket/Checkout.cshtml.cs index 64fc12e..22d0a19 100644 --- a/src/WebRazorPages/Pages/Basket/Checkout.cshtml.cs +++ b/src/WebRazorPages/Pages/Basket/Checkout.cshtml.cs @@ -3,13 +3,13 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.eShopWeb.RazorPages.ViewModels; using Microsoft.eShopWeb.RazorPages.Interfaces; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.AspNetCore.Identity; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using System; using Microsoft.AspNetCore.Http; using System.Collections.Generic; -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; namespace Microsoft.eShopWeb.RazorPages.Pages.Basket { diff --git a/src/WebRazorPages/Pages/Basket/Index.cshtml.cs b/src/WebRazorPages/Pages/Basket/Index.cshtml.cs index dbd50b7..d7ccf30 100644 --- a/src/WebRazorPages/Pages/Basket/Index.cshtml.cs +++ b/src/WebRazorPages/Pages/Basket/Index.cshtml.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.eShopWeb.RazorPages.ViewModels; using Microsoft.eShopWeb.RazorPages.Interfaces; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.AspNetCore.Identity; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; using System; using Microsoft.AspNetCore.Http; using System.Collections.Generic; diff --git a/src/WebRazorPages/Pages/Order/Detail.cshtml.cs b/src/WebRazorPages/Pages/Order/Detail.cshtml.cs index 96c45fc..c9a6c07 100644 --- a/src/WebRazorPages/Pages/Order/Detail.cshtml.cs +++ b/src/WebRazorPages/Pages/Order/Detail.cshtml.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.RazorPages; -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Linq; using System; -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System.Collections.Generic; namespace Microsoft.eShopWeb.RazorPages.Pages.Order diff --git a/src/WebRazorPages/Pages/Order/Index.cshtml.cs b/src/WebRazorPages/Pages/Order/Index.cshtml.cs index 72444db..bc28194 100644 --- a/src/WebRazorPages/Pages/Order/Index.cshtml.cs +++ b/src/WebRazorPages/Pages/Order/Index.cshtml.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.RazorPages; -using ApplicationCore.Interfaces; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using System.Collections.Generic; using System.Linq; using System; diff --git a/src/WebRazorPages/Pages/_ViewImports.cshtml b/src/WebRazorPages/Pages/_ViewImports.cshtml index e4dd2ac..1d6b867 100644 --- a/src/WebRazorPages/Pages/_ViewImports.cshtml +++ b/src/WebRazorPages/Pages/_ViewImports.cshtml @@ -1,6 +1,6 @@ @using Microsoft.eShopWeb.RazorPages @using Microsoft.eShopWeb.RazorPages.ViewModels @using Microsoft.AspNetCore.Identity -@using Infrastructure.Identity +@using Microsoft.eShopWeb.Infrastructure.Identity @namespace Microsoft.eShopWeb.RazorPages.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/WebRazorPages/Program.cs b/src/WebRazorPages/Program.cs index a9e9567..e5030f5 100644 --- a/src/WebRazorPages/Program.cs +++ b/src/WebRazorPages/Program.cs @@ -2,8 +2,8 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; -using Infrastructure.Data; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Identity; diff --git a/src/WebRazorPages/Services/BasketViewModelService.cs b/src/WebRazorPages/Services/BasketViewModelService.cs index f658671..be20dd5 100644 --- a/src/WebRazorPages/Services/BasketViewModelService.cs +++ b/src/WebRazorPages/Services/BasketViewModelService.cs @@ -1,9 +1,9 @@ -using ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Threading.Tasks; using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Linq; using System.Collections.Generic; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using Microsoft.eShopWeb.RazorPages.Interfaces; using Microsoft.eShopWeb.RazorPages.ViewModels; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; diff --git a/src/WebRazorPages/Services/CatalogService.cs b/src/WebRazorPages/Services/CatalogService.cs index b97ee54..d41a218 100644 --- a/src/WebRazorPages/Services/CatalogService.cs +++ b/src/WebRazorPages/Services/CatalogService.cs @@ -1,5 +1,5 @@ -using ApplicationCore.Interfaces; -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.RazorPages.Interfaces; diff --git a/src/WebRazorPages/Startup.cs b/src/WebRazorPages/Startup.cs index 09d1cf4..fc3ac8b 100644 --- a/src/WebRazorPages/Startup.cs +++ b/src/WebRazorPages/Startup.cs @@ -1,9 +1,9 @@ -using ApplicationCore.Interfaces; -using ApplicationCore.Services; -using Infrastructure.Data; -using Infrastructure.Identity; -using Infrastructure.Logging; -using Infrastructure.Services; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Services; +using Microsoft.eShopWeb.Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Logging; +using Microsoft.eShopWeb.Infrastructure.Services; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/src/WebRazorPages/ViewComponents/Basket.cs b/src/WebRazorPages/ViewComponents/Basket.cs index 02828f4..a9b8ee7 100644 --- a/src/WebRazorPages/ViewComponents/Basket.cs +++ b/src/WebRazorPages/ViewComponents/Basket.cs @@ -1,5 +1,5 @@ -using ApplicationCore.Interfaces; -using Infrastructure.Identity; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.Infrastructure.Identity; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FunctionalTests/FunctionalTests.csproj b/tests/FunctionalTests/FunctionalTests.csproj index 6818edc..3073c95 100644 --- a/tests/FunctionalTests/FunctionalTests.csproj +++ b/tests/FunctionalTests/FunctionalTests.csproj @@ -2,6 +2,7 @@ netcoreapp2.1 + Microsoft.eShopWeb.FunctionalTests diff --git a/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs b/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs index 74bd8be..d9a5f69 100644 --- a/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs +++ b/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb; -using Microsoft.eShopWeb.ViewModels; +using Microsoft.eShopWeb.Web; +using Microsoft.eShopWeb.Web.ViewModels; using Newtonsoft.Json; using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace FunctionalTests.Web.Controllers +namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers { public class ApiCatalogControllerList : IClassFixture> { diff --git a/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs b/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs index 18dd4bb..3f75870 100644 --- a/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs +++ b/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb; +using Microsoft.eShopWeb.Web; using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace FunctionalTests.Web.Controllers +namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers { public class CatalogControllerIndex : IClassFixture> { diff --git a/tests/FunctionalTests/Web/Controllers/CustomWebApplicationFactory.cs b/tests/FunctionalTests/Web/Controllers/CustomWebApplicationFactory.cs index ef2be86..aeb116c 100644 --- a/tests/FunctionalTests/Web/Controllers/CustomWebApplicationFactory.cs +++ b/tests/FunctionalTests/Web/Controllers/CustomWebApplicationFactory.cs @@ -1,14 +1,14 @@ -using Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Data; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb; +using Microsoft.eShopWeb.Web; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System; using Microsoft.EntityFrameworkCore; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; -namespace FunctionalTests.Web.Controllers +namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers { public class CustomWebApplicationFactory : WebApplicationFactory diff --git a/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs b/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs index 4cef8de..2b20b58 100644 --- a/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs +++ b/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb; +using Microsoft.eShopWeb.Web; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace FunctionalTests.Web.Controllers +namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers { public class OrderIndexOnGet : IClassFixture> { diff --git a/tests/FunctionalTests/WebRazorPages/CustomWebRazorPagesApplicationFactory.cs b/tests/FunctionalTests/WebRazorPages/CustomWebRazorPagesApplicationFactory.cs index c289cba..b9bce7d 100644 --- a/tests/FunctionalTests/WebRazorPages/CustomWebRazorPagesApplicationFactory.cs +++ b/tests/FunctionalTests/WebRazorPages/CustomWebRazorPagesApplicationFactory.cs @@ -1,14 +1,14 @@ -using Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Data; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb; +using Microsoft.eShopWeb.Web; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System; using Microsoft.EntityFrameworkCore; -using Infrastructure.Identity; +using Microsoft.eShopWeb.Infrastructure.Identity; -namespace FunctionalTests.WebRazorPages +namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages { public class CustomWebRazorPagesApplicationFactory : WebApplicationFactory diff --git a/tests/FunctionalTests/WebRazorPages/HomePageOnGet.cs b/tests/FunctionalTests/WebRazorPages/HomePageOnGet.cs index 5007d44..323ce90 100644 --- a/tests/FunctionalTests/WebRazorPages/HomePageOnGet.cs +++ b/tests/FunctionalTests/WebRazorPages/HomePageOnGet.cs @@ -3,7 +3,7 @@ using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace FunctionalTests.WebRazorPages +namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages { public class HomePageOnGet : IClassFixture> { diff --git a/tests/FunctionalTests/WebRazorPages/OrderIndexOnGet.cs b/tests/FunctionalTests/WebRazorPages/OrderIndexOnGet.cs index a32fc8a..e5a1959 100644 --- a/tests/FunctionalTests/WebRazorPages/OrderIndexOnGet.cs +++ b/tests/FunctionalTests/WebRazorPages/OrderIndexOnGet.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb; +using Microsoft.eShopWeb.Web; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Xunit; -namespace FunctionalTests.WebRazorPages +namespace Microsoft.eShopWeb.FunctionalTests.WebRazorPages { public class OrderIndexOnGet : IClassFixture> { diff --git a/tests/IntegrationTests/IntegrationTests.csproj b/tests/IntegrationTests/IntegrationTests.csproj index 1e98e77..51ff2b4 100644 --- a/tests/IntegrationTests/IntegrationTests.csproj +++ b/tests/IntegrationTests/IntegrationTests.csproj @@ -2,6 +2,7 @@ netcoreapp2.1 + Microsoft.eShopWeb.IntegrationTests diff --git a/tests/IntegrationTests/Repositories/OrderRepositoryTests/GetById.cs b/tests/IntegrationTests/Repositories/OrderRepositoryTests/GetById.cs index f1ac15a..b069e1a 100644 --- a/tests/IntegrationTests/Repositories/OrderRepositoryTests/GetById.cs +++ b/tests/IntegrationTests/Repositories/OrderRepositoryTests/GetById.cs @@ -1,11 +1,11 @@ -using Infrastructure.Data; +using Microsoft.eShopWeb.Infrastructure.Data; using Microsoft.EntityFrameworkCore; using System.Linq; -using UnitTests.Builders; +using Microsoft.eShopWeb.UnitTests.Builders; using Xunit; using Xunit.Abstractions; -namespace IntegrationTests.Repositories.OrderRepositoryTests +namespace Microsoft.eShopWeb.IntegrationTests.Repositories.OrderRepositoryTests { public class GetById { diff --git a/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs b/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs index 9714872..ad8d0ab 100644 --- a/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs +++ b/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs @@ -3,7 +3,7 @@ using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; using System.Linq; using Xunit; -namespace UnitTests.ApplicationCore.Entities.BasketTests +namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Entities.BasketTests { public class Total { diff --git a/tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs b/tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs index 469383f..2997c68 100644 --- a/tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs +++ b/tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs @@ -1,9 +1,9 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System.Collections.Generic; -using UnitTests.Builders; +using Microsoft.eShopWeb.UnitTests.Builders; using Xunit; -namespace UnitTests.ApplicationCore.Entities.OrderTests +namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Entities.OrderTests { public class Total { diff --git a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs index 80716e8..184b3ff 100644 --- a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs +++ b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs @@ -1,13 +1,13 @@ -using ApplicationCore.Exceptions; -using ApplicationCore.Interfaces; -using ApplicationCore.Services; +using Microsoft.eShopWeb.ApplicationCore.Exceptions; +using Microsoft.eShopWeb.ApplicationCore.Interfaces; +using Microsoft.eShopWeb.ApplicationCore.Services; using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; using Moq; using System; using Xunit; -namespace UnitTests.ApplicationCore.Services.BasketServiceTests +namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTests { public class SetQuantities { diff --git a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs index f284f56..38c0a30 100644 --- a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs +++ b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/TransferBasket.cs @@ -1,8 +1,8 @@ -using ApplicationCore.Services; +using Microsoft.eShopWeb.ApplicationCore.Services; using System; using Xunit; -namespace UnitTests.ApplicationCore.Services.BasketServiceTests +namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Services.BasketServiceTests { public class TransferBasket { diff --git a/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs b/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs index f7e5e80..b42e75e 100644 --- a/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs +++ b/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs @@ -1,11 +1,11 @@ -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; using System.Collections.Generic; using System.Linq; using Xunit; -namespace UnitTests +namespace Microsoft.eShopWeb.UnitTests { public class BasketWithItems { diff --git a/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecificationFilter.cs b/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecificationFilter.cs index 6479cdd..fa215bf 100644 --- a/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecificationFilter.cs +++ b/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecificationFilter.cs @@ -1,10 +1,10 @@ -using ApplicationCore.Specifications; +using Microsoft.eShopWeb.ApplicationCore.Specifications; using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Collections.Generic; using System.Linq; using Xunit; -namespace UnitTests +namespace Microsoft.eShopWeb.UnitTests { public class CatalogFilterSpecificationFilter { diff --git a/tests/UnitTests/Builders/AddressBuilder.cs b/tests/UnitTests/Builders/AddressBuilder.cs index 7720b4e..295e9e7 100644 --- a/tests/UnitTests/Builders/AddressBuilder.cs +++ b/tests/UnitTests/Builders/AddressBuilder.cs @@ -1,6 +1,6 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; -namespace UnitTests.Builders +namespace Microsoft.eShopWeb.UnitTests.Builders { public class AddressBuilder { diff --git a/tests/UnitTests/Builders/OrderBuilder.cs b/tests/UnitTests/Builders/OrderBuilder.cs index 3ef552d..17c0b11 100644 --- a/tests/UnitTests/Builders/OrderBuilder.cs +++ b/tests/UnitTests/Builders/OrderBuilder.cs @@ -1,7 +1,7 @@ -using ApplicationCore.Entities.OrderAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using System.Collections.Generic; -namespace UnitTests.Builders +namespace Microsoft.eShopWeb.UnitTests.Builders { public class OrderBuilder { diff --git a/tests/UnitTests/UnitTests.csproj b/tests/UnitTests/UnitTests.csproj index d316fcf..f351677 100644 --- a/tests/UnitTests/UnitTests.csproj +++ b/tests/UnitTests/UnitTests.csproj @@ -2,6 +2,7 @@ netcoreapp2.1 + Microsoft.eShopWeb.UnitTests