Merge remote-tracking branch 'upstream/dev' into dev

src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs

@@ -27,7 +27,7 @@ namespace FunctionalTests.Services.Catalog
                     .AddEnvironmentVariables();
                 }).UseStartup<Startup>();
 
-            var testServer =  new TestServer(hostBuilder);
+            var testServer = new TestServer(hostBuilder);
 
             testServer.Host
                 .MigrateDbContext<CatalogContext>((context, services) =>

src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs

@@ -92,7 +92,7 @@ namespace FunctionalTests.Services
             return itemUpdated;
         }
 
-        private async  Task<PaginatedItemsViewModel<CatalogItem>> GetCatalogAsync(HttpClient catalogClient)
+        private async Task<PaginatedItemsViewModel<CatalogItem>> GetCatalogAsync(HttpClient catalogClient)
         {
             var response = await catalogClient.GetAsync(CatalogScenariosBase.Get.Items);
             var items = await response.Content.ReadAsStringAsync();

src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs

@@ -69,7 +69,8 @@ namespace FunctionalTests.Services.Ordering
                 var ordersGetResponse = await orderClient.GetStringAsync(OrderingScenariosBase.Get.Orders);
                 var orders = JsonConvert.DeserializeObject<List<Order>>(ordersGetResponse);
 
-                if (orders == null || orders.Count == 0) {
+                if (orders == null || orders.Count == 0)
+                {
                     counter++;
                     await Task.Delay(100);
                     continue;
@@ -143,4 +144,3 @@ namespace FunctionalTests.Services.Ordering
         }
     }
 }
- 

src/Web/WebMVC/AppSettings.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.WebMVC
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.WebMVC
 {
     public class AppSettings
     {

src/Web/WebMVC/Controllers/CampaignsController.cs

@@ -2,16 +2,16 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
     using AspNetCore.Authorization;
     using AspNetCore.Mvc;
-    using global::WebMVC.Services.ModelDTOs;
     using global::WebMVC.Services;
+    using global::WebMVC.Services.ModelDTOs;
     using global::WebMVC.ViewModels;
+    using Microsoft.AspNetCore.Authentication.OpenIdConnect;
     using Microsoft.Extensions.Options;
     using Services;
     using System;
     using System.Threading.Tasks;
     using ViewModels;
     using ViewModels.Pagination;
-    using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
     [Authorize(AuthenticationSchemes = OpenIdConnectDefaults.AuthenticationScheme)]
     public class CampaignsController : Controller
@@ -31,12 +31,12 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
         {
             var campaignList = await _campaignService.GetCampaigns(pageSize, page);
 
-            if(campaignList is null)
+            if (campaignList is null)
             {
                 return View();
             }
 
-            var totalPages = (int) Math.Ceiling((decimal) campaignList.Count / pageSize);
+            var totalPages = (int)Math.Ceiling((decimal)campaignList.Count / pageSize);
 
             var vm = new CampaignViewModel
             {

src/Web/WebMVC/Controllers/CatalogController.cs

@@ -1,10 +1,9 @@
-using System;
+using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels;
-using Microsoft.AspNetCore.Http;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination;
+using System;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
@@ -15,7 +14,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
         public CatalogController(ICatalogService catalogSvc) =>
             _catalogSvc = catalogSvc;
 
-        public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page, [FromQuery]string errorMsg)
+        public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page, [FromQuery] string errorMsg)
         {
             var itemsPage = 10;
             var catalog = await _catalogSvc.GetCatalogItems(page ?? 0, itemsPage, BrandFilterApplied, TypesFilterApplied);

src/Web/WebMVC/Controllers/OrderManagementController.cs

@@ -1,13 +1,10 @@
-using System;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using System.Collections.Generic;
+using Microsoft.AspNetCore.Authorization;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using WebMVC.Services.ModelDTOs;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using WebMVC.Services.ModelDTOs;
 
 namespace WebMVC.Controllers
 {

src/Web/WebMVC/Controllers/TestController.cs

@@ -48,7 +48,7 @@ namespace WebMVC.Controllers
 
             if (response.IsSuccessStatusCode)
             {
-                var str =  await response.Content.ReadAsStringAsync();
+                var str = await response.Content.ReadAsStringAsync();
 
                 return Ok(str);
             }

src/Web/WebMVC/Extensions/HttpClientExtensions.cs

@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Extensions
 {

src/Web/WebMVC/Extensions/SessionExtensions.cs

@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 
 public static class SessionExtensions

src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;

src/Web/WebMVC/Infrastructure/WebContextSeed.cs

@@ -44,7 +44,7 @@ namespace WebMVC.Infrastructure
                 }
 
                 string destinationFilename = Path.Combine(webroot, "css", "override.css");
-                File.Copy(overrideCssFile, destinationFilename, true );
+                File.Copy(overrideCssFile, destinationFilename, true);
             }
             catch (Exception ex)
             {
@@ -86,7 +86,7 @@ namespace WebMVC.Infrastructure
                     }
                 }
             }
-            catch ( Exception ex )
+            catch (Exception ex)
             {
                 log.Error(ex, "EXCEPTION ERROR: {Message}", ex.Message);
             }

src/Web/WebMVC/Program.cs

@@ -48,7 +48,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
                 .UseSerilog()
                 .Build();
 
-         private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
+        private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
         {
             var seqServerUrl = configuration["Serilog:SeqServerUrl"];
             var logstashUrl = configuration["Serilog:LogstashgUrl"];
@@ -57,10 +57,12 @@ namespace Microsoft.eShopOnContainers.WebMVC
                 .Enrich.WithProperty("ApplicationContext", AppName)
                 .Enrich.FromLogContext()
                 .WriteTo.Console();
-            if (!string.IsNullOrWhiteSpace(seqServerUrl)) {
+            if (!string.IsNullOrWhiteSpace(seqServerUrl))
+            {
                 cfg.WriteTo.Seq(seqServerUrl);
             }
-            if (!string.IsNullOrWhiteSpace(logstashUrl)) {
+            if (!string.IsNullOrWhiteSpace(logstashUrl))
+            {
                 cfg.WriteTo.Http(logstashUrl);
             }
             return cfg.CreateLogger();

src/Web/WebMVC/Services/BasketService.cs

@@ -23,7 +23,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services
         {
             _apiClient = httpClient;
             _settings = settings;
-            _logger =logger;
+            _logger = logger;
 
             _basketByPassUrl = $"{_settings.Value.PurchaseUrl}/b/api/v1/basket";
             _purchaseUrl = $"{_settings.Value.PurchaseUrl}/api/v1";
@@ -97,7 +97,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services
 
             var responseString = await _apiClient.GetStringAsync(uri);
 
-            var response =  JsonConvert.DeserializeObject<Order>(responseString);
+            var response = JsonConvert.DeserializeObject<Order>(responseString);
 
             return response;
         }

src/Web/WebMVC/Services/IBasketService.cs

@@ -1,7 +1,5 @@
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using WebMVC.Services.ModelDTOs;
 

src/Web/WebMVC/Services/ICampaignService.cs

@@ -1,6 +1,5 @@
 namespace Microsoft.eShopOnContainers.WebMVC.Services
 {
-    using System.Collections.Generic;
     using System.Threading.Tasks;
     using ViewModels;
 

src/Web/WebMVC/Services/ICatalogService.cs

@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Services

src/Web/WebMVC/Services/IIdentityParser.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Security.Principal;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Principal;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Services
 {

src/Web/WebMVC/Services/IOrderingService.cs

@@ -1,7 +1,5 @@
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using WebMVC.Services.ModelDTOs;
 

src/Web/WebMVC/Services/IdentityParser.cs

@@ -1,14 +1,12 @@
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Security.Principal;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.Services
 {
-    public class IdentityParser:IIdentityParser<ApplicationUser>
+    public class IdentityParser : IIdentityParser<ApplicationUser>
     {
         public ApplicationUser Parse(IPrincipal principal)
         {

src/Web/WebMVC/Startup.cs

@@ -7,19 +7,16 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Logging;
 using StackExchange.Redis;
 using System;
 using System.IdentityModel.Tokens.Jwt;
-using System.Net.Http;
 using WebMVC.Infrastructure;
 using WebMVC.Infrastructure.Middlewares;
 using WebMVC.Services;
@@ -46,7 +43,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
                 .AddDevspaces()
                 .AddHttpClientServices(Configuration);
 
-            IdentityModelEventSource.ShowPII  = true;       // Caution! Do NOT use in production: https://aka.ms/IdentityModel/PII
+            IdentityModelEventSource.ShowPII = true;       // Caution! Do NOT use in production: https://aka.ms/IdentityModel/PII
 
             services.AddControllers();
 

src/Web/WebMVC/ViewComponents/Cart.cs

@@ -1,10 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels.CartViewModels;
-using Microsoft.eShopOnContainers.WebMVC.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewComponents

src/Web/WebMVC/ViewComponents/CartList.cs

@@ -1,9 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.eShopOnContainers.WebMVC.Services;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewComponents

src/Web/WebMVC/ViewModels/Annotations/CardExpiration.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.Annotations
 {
@@ -24,7 +21,8 @@ namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.Annotations
                 DateTime d = new DateTime(year, month, 1);
 
                 return d > DateTime.UtcNow;
-            } else
+            }
+            else
             {
                 return false;
             }

src/Web/WebMVC/ViewModels/ApplicationUser.cs

@@ -1,9 +1,5 @@
-using System;
+using Microsoft.AspNetCore.Identity;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Identity;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {

src/Web/WebMVC/ViewModels/Basket.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
@@ -16,7 +15,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 
         public decimal Total()
         {
-            return Math.Round(Items.Sum(x => x.UnitPrice * x.Quantity),2);
+            return Math.Round(Items.Sum(x => x.UnitPrice * x.Quantity), 2);
         }
     }
 }

src/Web/WebMVC/ViewModels/BasketItem.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class BasketItem
     {

src/Web/WebMVC/ViewModels/CampaignViewModel/CampaignViewModel.cs

@@ -1,11 +1,11 @@
 namespace WebMVC.ViewModels
 {
-    using System.Collections.Generic;
     using Microsoft.eShopOnContainers.WebMVC.ViewModels;
     using Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination;
-    using WebMVC.ViewModels.Annotations;
     using Newtonsoft.Json;
+    using System.Collections.Generic;
     using System.ComponentModel.DataAnnotations;
+    using WebMVC.ViewModels.Annotations;
 
     public class CampaignViewModel
     {

src/Web/WebMVC/ViewModels/CartViewModels/IndexViewModel.cs

@@ -1,10 +1,4 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.CartViewModels
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.CartViewModels
 {
     public class CartComponentViewModel
     {

src/Web/WebMVC/ViewModels/Catalog.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {

src/Web/WebMVC/ViewModels/CatalogItem.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
-
-namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class CatalogItem
     {

src/Web/WebMVC/ViewModels/CatalogViewModels/IndexViewModel.cs

@@ -1,9 +1,6 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels
 {

src/Web/WebMVC/ViewModels/Header.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
-
-namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class Header
     {

src/Web/WebMVC/ViewModels/Order.cs

@@ -5,21 +5,19 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
 using WebMVC.Services.ModelDTOs;
 
 namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class Order
     {
-        public string OrderNumber {get;set;}
+        public string OrderNumber { get; set; }
 
-        public DateTime Date {get;set;}
+        public DateTime Date { get; set; }
 
         public string Status { get; set; }
 
-        public decimal Total {get;set;}
+        public decimal Total { get; set; }
 
         public string Description { get; set; }
 

src/Web/WebMVC/ViewModels/OrderItem.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class OrderItem
     {

src/Web/WebMVC/ViewModels/Pagination/PaginationInfo.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination
 {
     public class PaginationInfo
     {

src/Web/WebSPA/AppSettings.cs

@@ -1,9 +1,4 @@
-using System;
+namespace eShopOnContainers.WebSPA
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace eShopOnContainers.WebSPA
 {
     public class AppSettings
     {

src/Web/WebSPA/Program.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using System.IO;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Serilog;
+using System.IO;
 
 namespace eShopConContainers.WebSPA
 {

src/Web/WebSPA/Server/Controllers/HomeController.cs

@@ -1,9 +1,9 @@
 // For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
 
+using eShopOnContainers.WebSPA;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using eShopOnContainers.WebSPA;
 
 namespace eShopConContainers.WebSPA.Server.Controllers
 {

src/Web/WebStatus/Controllers/HomeController.cs

@@ -1,8 +1,6 @@
-using HealthChecks.UI.Configuration;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace WebStatus.Controllers
 {