diff --git a/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs b/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs index 15f336c..5705eb1 100644 --- a/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs +++ b/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs @@ -1,6 +1,5 @@ using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Ardalis.GuardClauses; -using Microsoft.eShopWeb.ApplicationCore.Entities; using System.Collections.Generic; namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate diff --git a/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs b/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs index 0bb9df4..631ed4e 100644 --- a/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs +++ b/src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs @@ -1,6 +1,4 @@ -using Microsoft.eShopWeb.ApplicationCore.Entities; - -namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate { public class PaymentMethod : BaseEntity { diff --git a/src/ApplicationCore/Entities/CatalogBrand.cs b/src/ApplicationCore/Entities/CatalogBrand.cs index fc8be2f..1c90dfa 100644 --- a/src/ApplicationCore/Entities/CatalogBrand.cs +++ b/src/ApplicationCore/Entities/CatalogBrand.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Microsoft.eShopWeb.ApplicationCore.Entities +namespace Microsoft.eShopWeb.ApplicationCore.Entities { public class CatalogBrand : BaseEntity { diff --git a/src/ApplicationCore/Entities/OrderAggregate/Order.cs b/src/ApplicationCore/Entities/OrderAggregate/Order.cs index c8be0f1..4c2f92e 100644 --- a/src/ApplicationCore/Entities/OrderAggregate/Order.cs +++ b/src/ApplicationCore/Entities/OrderAggregate/Order.cs @@ -1,6 +1,5 @@ using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Ardalis.GuardClauses; -using Microsoft.eShopWeb.ApplicationCore.Entities; using System; using System.Collections.Generic; diff --git a/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs b/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs index 5557791..4c60432 100644 --- a/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs +++ b/src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs @@ -1,6 +1,4 @@ -using Microsoft.eShopWeb.ApplicationCore.Entities; - -namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate +namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate { public class OrderItem : BaseEntity diff --git a/src/ApplicationCore/Services/UriComposer.cs b/src/ApplicationCore/Services/UriComposer.cs index cf312b3..a0f7609 100644 --- a/src/ApplicationCore/Services/UriComposer.cs +++ b/src/ApplicationCore/Services/UriComposer.cs @@ -1,5 +1,4 @@ using Microsoft.eShopWeb.ApplicationCore.Interfaces; -using Microsoft.eShopWeb; namespace Microsoft.eShopWeb.ApplicationCore.Services { diff --git a/src/Infrastructure/Data/CatalogContextSeed.cs b/src/Infrastructure/Data/CatalogContextSeed.cs index 24c4b8b..afa6349 100644 --- a/src/Infrastructure/Data/CatalogContextSeed.cs +++ b/src/Infrastructure/Data/CatalogContextSeed.cs @@ -1,5 +1,4 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.eShopWeb.ApplicationCore.Entities; +using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; diff --git a/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs b/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs index e971ac8..e0f1f76 100644 --- a/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs +++ b/src/Infrastructure/Data/Migrations/20171018175735_Initial.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using System; -using System.Collections.Generic; namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations { diff --git a/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs b/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs index da98574..88082d5 100644 --- a/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs +++ b/src/Infrastructure/Data/Migrations/CatalogContextModelSnapshot.cs @@ -1,11 +1,8 @@ // -using Microsoft.eShopWeb.Infrastructure.Data; + using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.EntityFrameworkCore.Storage.Internal; using System; namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations diff --git a/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs b/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs index 6c146e7..4272bc5 100644 --- a/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs +++ b/src/Infrastructure/Identity/Migrations/20170822214310_InitialIdentityModel.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Metadata; diff --git a/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs b/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs index fffdaac..e672c18 100644 --- a/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs +++ b/src/Infrastructure/Identity/Migrations/AppIdentityDbContextModelSnapshot.cs @@ -2,8 +2,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.eShopWeb.Infrastructure.Identity; namespace Microsoft.eShopWeb.Infrastructure.Identity.Migrations { diff --git a/src/Web/Controllers/Api/BaseApiController.cs b/src/Web/Controllers/Api/BaseApiController.cs index 3d0bb2d..4acc787 100644 --- a/src/Web/Controllers/Api/BaseApiController.cs +++ b/src/Web/Controllers/Api/BaseApiController.cs @@ -1,6 +1,4 @@ -using Microsoft.eShopWeb.Web.Services; -using Microsoft.AspNetCore.Mvc; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; namespace Microsoft.eShopWeb.Web.Controllers.Api { diff --git a/src/Web/Controllers/OrderController.cs b/src/Web/Controllers/OrderController.cs index acff1f7..7ab4d80 100644 --- a/src/Web/Controllers/OrderController.cs +++ b/src/Web/Controllers/OrderController.cs @@ -2,8 +2,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.eShopWeb.Web.ViewModels; -using System; -using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate; using Microsoft.eShopWeb.ApplicationCore.Interfaces; using System.Linq; using Microsoft.eShopWeb.ApplicationCore.Specifications; diff --git a/src/Web/ViewComponents/Basket.cs b/src/Web/ViewComponents/Basket.cs index 9cfa0e1..4d870f1 100644 --- a/src/Web/ViewComponents/Basket.cs +++ b/src/Web/ViewComponents/Basket.cs @@ -1,8 +1,6 @@ using Microsoft.eShopWeb.Infrastructure.Identity; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using Microsoft.eShopWeb; using Microsoft.eShopWeb.Web.Interfaces; using Microsoft.eShopWeb.Web.ViewModels; using System.Linq; diff --git a/src/Web/ViewModels/Account/RegisterViewModel.cs b/src/Web/ViewModels/Account/RegisterViewModel.cs index 0d89911..b1bd4f9 100644 --- a/src/Web/ViewModels/Account/RegisterViewModel.cs +++ b/src/Web/ViewModels/Account/RegisterViewModel.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace Microsoft.eShopWeb.Web.ViewModels.Account { diff --git a/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs b/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs index c281a39..00a5795 100644 --- a/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs +++ b/src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.DataAnnotations; - -namespace Microsoft.eShopWeb.Web.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 13022d8..ae15fe2 100644 --- a/src/Web/ViewModels/OrderItemViewModel.cs +++ b/src/Web/ViewModels/OrderItemViewModel.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace Microsoft.eShopWeb.Web.ViewModels +namespace Microsoft.eShopWeb.Web.ViewModels { public class OrderItemViewModel { diff --git a/src/Web/Views/Account/LoginWith2fa.cshtml b/src/Web/Views/Account/LoginWith2fa.cshtml index 2e52d37..39f4443 100644 --- a/src/Web/Views/Account/LoginWith2fa.cshtml +++ b/src/Web/Views/Account/LoginWith2fa.cshtml @@ -1,4 +1,3 @@ -@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 188ca5f..576111e 100644 --- a/src/Web/Views/Account/Register.cshtml +++ b/src/Web/Views/Account/Register.cshtml @@ -1,7 +1,3 @@ -@using System.Collections.Generic -@using Microsoft.AspNetCore.Http -@using Microsoft.AspNetCore.Http.Authentication -@using Microsoft.eShopWeb.Web.ViewModels.Account @model RegisterViewModel @{ ViewData["Title"] = "Register"; diff --git a/src/Web/Views/Account/Signin.cshtml b/src/Web/Views/Account/Signin.cshtml index 7c88be0..9d1742d 100644 --- a/src/Web/Views/Account/Signin.cshtml +++ b/src/Web/Views/Account/Signin.cshtml @@ -1,4 +1,3 @@ -@using Microsoft.eShopWeb.Web.ViewModels.Account @model LoginViewModel @{ ViewData["Title"] = "Log in"; diff --git a/src/Web/Views/Basket/Checkout.cshtml b/src/Web/Views/Basket/Checkout.cshtml index 3cc3d86..be7f24d 100644 --- a/src/Web/Views/Basket/Checkout.cshtml +++ b/src/Web/Views/Basket/Checkout.cshtml @@ -1,5 +1,4 @@ -@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 17e0ecf..c1bbe7b 100644 --- a/src/Web/Views/Basket/Index.cshtml +++ b/src/Web/Views/Basket/Index.cshtml @@ -1,5 +1,4 @@ -@using Microsoft.eShopWeb.Web.ViewModels -@model BasketViewModel +@model BasketViewModel @{ ViewData["Title"] = "Basket"; } diff --git a/src/Web/Views/Order/Detail.cshtml b/src/Web/Views/Order/Detail.cshtml index 1eacdef..788766b 100644 --- a/src/Web/Views/Order/Detail.cshtml +++ b/src/Web/Views/Order/Detail.cshtml @@ -1,5 +1,4 @@ -@using Microsoft.eShopWeb.Web.ViewModels -@model OrderViewModel +@model OrderViewModel @{ ViewData["Title"] = "My Order History"; } diff --git a/src/Web/Views/Order/Index.cshtml b/src/Web/Views/Order/Index.cshtml index b35e00a..7478ba6 100644 --- a/src/Web/Views/Order/Index.cshtml +++ b/src/Web/Views/Order/Index.cshtml @@ -1,5 +1,4 @@ -@using Microsoft.eShopWeb.Web.ViewModels -@model IEnumerable +@model IEnumerable @{ ViewData["Title"] = "My Order History"; } diff --git a/src/Web/Views/Shared/_LoginPartial.cshtml b/src/Web/Views/Shared/_LoginPartial.cshtml index 6f03b12..d161a61 100644 --- a/src/Web/Views/Shared/_LoginPartial.cshtml +++ b/src/Web/Views/Shared/_LoginPartial.cshtml @@ -1,6 +1,4 @@ -@using Microsoft.AspNetCore.Identity - - @if (Context.User.Identity.IsAuthenticated) +@if (Context.User.Identity.IsAuthenticated) {
diff --git a/src/WebRazorPages/Interfaces/IBasketViewModelService.cs b/src/WebRazorPages/Interfaces/IBasketViewModelService.cs index 975478a..c1dbbe1 100644 --- a/src/WebRazorPages/Interfaces/IBasketViewModelService.cs +++ b/src/WebRazorPages/Interfaces/IBasketViewModelService.cs @@ -1,5 +1,4 @@ using Microsoft.eShopWeb.RazorPages.ViewModels; -using System.Collections.Generic; using System.Threading.Tasks; namespace Microsoft.eShopWeb.RazorPages.Interfaces diff --git a/src/WebRazorPages/Pages/Account/Signin.cshtml b/src/WebRazorPages/Pages/Account/Signin.cshtml index e5f4407..e594ae5 100644 --- a/src/WebRazorPages/Pages/Account/Signin.cshtml +++ b/src/WebRazorPages/Pages/Account/Signin.cshtml @@ -1,7 +1,4 @@ @page -@using System.Collections.Generic -@using Microsoft.AspNetCore.Http -@using Microsoft.AspNetCore.Http.Authentication @model SigninModel @{ ViewData["Title"] = "Log in"; diff --git a/src/WebRazorPages/Pages/Index.cshtml.cs b/src/WebRazorPages/Pages/Index.cshtml.cs index 74fce01..68af9ab 100644 --- a/src/WebRazorPages/Pages/Index.cshtml.cs +++ b/src/WebRazorPages/Pages/Index.cshtml.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.eShopWeb.RazorPages.ViewModels; using Microsoft.eShopWeb.RazorPages.Interfaces; diff --git a/src/WebRazorPages/Pages/Order/Index.cshtml b/src/WebRazorPages/Pages/Order/Index.cshtml index 312bcfb..130e9c6 100644 --- a/src/WebRazorPages/Pages/Order/Index.cshtml +++ b/src/WebRazorPages/Pages/Order/Index.cshtml @@ -1,5 +1,4 @@ @page -@using System.Linq; @model IndexModel @{ ViewData["Title"] = "My Order History"; diff --git a/src/WebRazorPages/Pages/Shared/_LoginPartial.cshtml b/src/WebRazorPages/Pages/Shared/_LoginPartial.cshtml index 708fb14..38886cc 100644 --- a/src/WebRazorPages/Pages/Shared/_LoginPartial.cshtml +++ b/src/WebRazorPages/Pages/Shared/_LoginPartial.cshtml @@ -1,6 +1,4 @@ -@using Microsoft.AspNetCore.Identity - - @if (Context.User.Identity.IsAuthenticated) +@if (Context.User.Identity.IsAuthenticated) {
diff --git a/src/WebRazorPages/ViewComponents/Basket.cs b/src/WebRazorPages/ViewComponents/Basket.cs index a9b8ee7..11fd674 100644 --- a/src/WebRazorPages/ViewComponents/Basket.cs +++ b/src/WebRazorPages/ViewComponents/Basket.cs @@ -1,6 +1,5 @@ using Microsoft.eShopWeb.ApplicationCore.Interfaces; using Microsoft.eShopWeb.Infrastructure.Identity; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; diff --git a/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs b/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs index d9a5f69..e3e675b 100644 --- a/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs +++ b/tests/FunctionalTests/Web/Controllers/ApiCatalogControllerList.cs @@ -1,5 +1,4 @@ -using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb.Web; +using Microsoft.eShopWeb.Web; using Microsoft.eShopWeb.Web.ViewModels; using Newtonsoft.Json; using System.Linq; diff --git a/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs b/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs index 3f75870..8fec0cc 100644 --- a/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs +++ b/tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs @@ -1,5 +1,4 @@ -using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.eShopWeb.Web; +using Microsoft.eShopWeb.Web; using System.Net.Http; using System.Threading.Tasks; using Xunit; diff --git a/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs b/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs index ad8d0ab..3849ec1 100644 --- a/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs +++ b/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs @@ -1,5 +1,4 @@ -using Microsoft.eShopWeb.ApplicationCore.Entities; -using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; +using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; using System.Linq; using Xunit; diff --git a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs index 184b3ff..9c5f11d 100644 --- a/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs +++ b/tests/UnitTests/ApplicationCore/Services/BasketServiceTests/SetQuantities.cs @@ -1,7 +1,6 @@ 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; diff --git a/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs b/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs index b42e75e..ee55a9d 100644 --- a/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs +++ b/tests/UnitTests/ApplicationCore/Specifications/BasketWithItemsSpecification.cs @@ -1,5 +1,4 @@ using Microsoft.eShopWeb.ApplicationCore.Specifications; -using Microsoft.eShopWeb.ApplicationCore.Entities; using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate; using System.Collections.Generic; using System.Linq;