Merge branch 'dev' into migration/net-5

src/Services/Basket/Basket.API/Infrastructure/Middlewares/FailingMiddleware.cs

@@ -12,6 +12,7 @@ namespace Basket.API.Infrastructure.Middlewares
         private bool _mustFail;
         private readonly FailingOptions _options;
         private readonly ILogger _logger;
+
         public FailingMiddleware(RequestDelegate next, ILogger<FailingMiddleware> logger, FailingOptions options)
         {
             _next = next;
@@ -19,6 +20,7 @@ namespace Basket.API.Infrastructure.Middlewares
             _mustFail = false;
             _logger = logger;
         }
+
         public async Task Invoke(HttpContext context)
         {
             var path = context.Request.Path;

src/Services/Catalog/Catalog.API/CatalogSettings.cs

@@ -7,6 +7,7 @@
         public string EventBusConnection { get; set; }
 
         public bool UseCustomizationData { get; set; }
+
         public bool AzureStorageEnabled { get; set; }
     }
 }

src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs

@@ -19,6 +19,7 @@ namespace Catalog.API.Grpc
         private readonly CatalogContext _catalogContext;
         private readonly CatalogSettings _settings;
         private readonly ILogger _logger;
+
         public CatalogService(CatalogContext dbContext, IOptions<CatalogSettings> settings, ILogger<CatalogService> logger)
         {
             _settings = settings.Value;

src/Services/Catalog/Catalog.API/Proto/catalog.proto

@@ -10,6 +10,7 @@ package CatalogApi;
 message CatalogItemRequest {
 	int32 id = 1;
 }
+
 message CatalogItemsRequest {
 	string ids = 1;
 	int32 pageSize = 2;

src/Services/Catalog/Catalog.API/ViewModel/PaginatedItemsViewModel.cs

@@ -15,10 +15,10 @@
 
         public PaginatedItemsViewModel(int pageIndex, int pageSize, long count, IEnumerable<TEntity> data)
         {
-            this.PageIndex = pageIndex;
-            this.PageSize = pageSize;
-            this.Count = count;
-            this.Data = data;
+            PageIndex = pageIndex;
+            PageSize = pageSize;
+            Count = count;
+            Data = data;
         }
     }
 }

src/Services/Ordering/Ordering.FunctionalTests/appsettings.json

@@ -1,12 +1,12 @@
 {
+  "CheckUpdateTime": "30000",
   "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
+  "EventBusConnection": "localhost",
   "ExternalCatalogBaseUrl": "http://localhost:5101",
+  "GracePeriodTime": "1",
   "IdentityUrl": "http://localhost:5105",
   "IdentityUrlExternal": "http://localhost:5105",
   "isTest": "true",
-  "EventBusConnection": "localhost",
-  "CheckUpdateTime": "30000",
-  "GracePeriodTime": "1",
   "SubscriptionClientName": "Ordering",
   "SuppressCheckForUnhandledSecurityMetadata": true
 }

src/Web/WebSPA/package-lock.json

@@ -8153,9 +8153,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
       "dev": true
     },
     "inquirer": {

src/Web/WebhookClient/Models/WebHookReceived.cs

@@ -5,6 +5,7 @@ namespace WebhookClient.Models
     public class WebHookReceived
     {
         public DateTime When { get; set; }
+        
         public string Data { get; set; }
 
         public string Token { get; set; }