Merge branch 'dev' into disposeAsync

TarasKovalenko · TarasKovalenko · commit 94c300b604d9 · 2022-08-01T13:09:15.000+03:00
diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs
@@ -242,11 +242,11 @@ private void RegisterEventBus(IServiceCollection services)
                 var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
                 var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
                 var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
-                var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+                var eventBusSubscriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                 string subscriptionName = Configuration["SubscriptionClientName"];
 
                 return new EventBusServiceBus(serviceBusPersisterConnection, logger,
-                    eventBusSubcriptionsManager, iLifetimeScope, subscriptionName);
+                    eventBusSubscriptionsManager, iLifetimeScope, subscriptionName);
             });
         }
         else
@@ -257,15 +257,15 @@ private void RegisterEventBus(IServiceCollection services)
                 var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
                 var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
                 var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
-                var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+                var eventBusSubscriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
 
                 var retryCount = 5;
                 if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"]))
                 {
                     retryCount = int.Parse(Configuration["EventBusRetryCount"]);
                 }
 
-                return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount);
+                return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubscriptionsManager, subscriptionClientName, retryCount);
             });
         }
 
diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.18" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
-    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
+    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
     <PackageReference Include="Polly" Version="7.2.2" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.1-dev-00229" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.1-dev-00787" />
@@ -50,7 +50,7 @@
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.2.1" />
-	  <PackageReference Include="System.Data.SqlClient" version="4.8.2"/>
+	  <PackageReference Include="System.Data.SqlClient" version="4.8.2" />
     <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.1" />
     <PackageReference Include="Azure.Identity" Version="1.4.0" />
   </ItemGroup>
diff --git a/src/Services/Identity/Identity.API/Services/RedirectService.cs b/src/Services/Identity/Identity.API/Services/RedirectService.cs
@@ -4,15 +4,14 @@ public class RedirectService : IRedirectService
     {
         public string ExtractRedirectUriFromReturnUrl(string url)
         {
-            var result = "";
             var decodedUrl = System.Net.WebUtility.HtmlDecode(url);
             var results = Regex.Split(decodedUrl, "redirect_uri=");
             if (results.Length < 2)
                 return "";
 
-            result = results[1];
+            string result = results[1];
 
-            var splitKey = "";
+            string splitKey;
             if (result.Contains("signin-oidc"))
                 splitKey = "signin-oidc";
             else
diff --git a/src/Services/Ordering/Ordering.API/Application/Behaviors/TransactionBehaviour.cs b/src/Services/Ordering/Ordering.API/Application/Behaviors/TransactionBehaviour.cs
@@ -35,7 +35,7 @@ await strategy.ExecuteAsync(async () =>
             {
                 Guid transactionId;
 
-                using var transaction = await _dbContext.BeginTransactionAsync();
+                await using var transaction = await _dbContext.BeginTransactionAsync();
                 using (LogContext.PushProperty("TransactionContext", transaction.TransactionId))
                 {
                     _logger.LogInformation("----- Begin transaction {TransactionId} for {CommandName} ({@Command})", transaction.TransactionId, typeName, request);
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -134,8 +134,7 @@ public static IServiceCollection AddCustomMvc(this IServiceCollection services)
             })
             // Added for functional tests
             .AddApplicationPart(typeof(OrdersController).Assembly)
-            .AddJsonOptions(options => options.JsonSerializerOptions.WriteIndented = true)
-            .SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
+            .AddJsonOptions(options => options.JsonSerializerOptions.WriteIndented = true);
 
         services.AddCors(options =>
         {
diff --git a/src/Services/Ordering/Ordering.Domain/GlobalUsings.cs b/src/Services/Ordering/Ordering.Domain/GlobalUsings.cs
@@ -4,7 +4,6 @@
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
 global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Events;
-global using Microsoft.eShopOnContainers.Services.Ordering.Domain.Exceptions;
 global using System.Collections.Generic;
 global using System.Linq;
 global using System.Reflection;
diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
@@ -10,8 +10,4 @@
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
@@ -16,8 +16,4 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
@@ -72,7 +72,7 @@ public async Task CommitTransactionAsync(IDbContextTransaction transaction)
         try
         {
             await SaveChangesAsync();
-            transaction.Commit();
+            await transaction.CommitAsync();
         }
         catch
         {
@@ -128,7 +128,7 @@ public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamRequest<TRespo
             return default(IAsyncEnumerable<object?>);
         }
 
-        public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default(CancellationToken)) where TNotification : INotification
+        public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default) where TNotification : INotification
         {
             return Task.CompletedTask;
         }
@@ -138,7 +138,7 @@ public Task Publish(object notification, CancellationToken cancellationToken = d
             return Task.CompletedTask;
         }
 
-        public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)
         {
             return Task.FromResult<TResponse>(default(TResponse));
         }
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
@@ -19,10 +19,8 @@ public Buyer Add(Buyer buyer)
                 .Add(buyer)
                 .Entity;
         }
-        else
-        {
-            return buyer;
-        }
+
+        return buyer;
     }
 
     public Buyer Update(Buyer buyer)
diff --git a/src/Services/Ordering/Ordering.SignalrHub/GlobalUsings.cs b/src/Services/Ordering/Ordering.SignalrHub/GlobalUsings.cs
@@ -22,8 +22,6 @@
 global using Microsoft.Extensions.Logging;
 global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.AutofacModules;
 global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.IntegrationEvents.EventHandling;
-global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.IntegrationEvents.Events;
-global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub.IntegrationEvents;
 global using Microsoft.eShopOnContainers.Services.Ordering.SignalrHub;
 global using RabbitMQ.Client;
 global using Serilog.Context;
diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
@@ -7,11 +7,7 @@
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
-  <ItemGroup>
+	<ItemGroup>
 	  <PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="5.1.1" />
 	  <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="5.0.1" />
 	  <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
diff --git a/src/Services/Webhooks/Webhooks.API/Controllers/WebhooksController.cs b/src/Services/Webhooks/Webhooks.API/Controllers/WebhooksController.cs
@@ -52,9 +52,6 @@ public async Task<IActionResult> SubscribeWebhook(WebhookSubscriptionRequest req
             return ValidationProblem(ModelState);
         }
 
-        var userId = _identityService.GetUserIdentity();
-
-
         var grantOk = await _grantUrlTester.TestGrantUrl(request.Url, request.GrantUrl, request.Token ?? string.Empty);
 
         if (grantOk)
diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs
@@ -22,8 +22,6 @@ public void ConfigureServices(IServiceCollection services)
 
         IdentityModelEventSource.ShowPII = true;       // Caution! Do NOT use in production: https://aka.ms/IdentityModel/PII
 
-        services.AddControllers();
-
         services.AddCustomAuthentication(Configuration);
     }
 
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
+    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.1-dev-00216" />
diff --git a/src/Web/WebSPA/Client/package-lock.json b/src/Web/WebSPA/Client/package-lock.json
diff --git a/src/Web/WebSPA/Client/yarn.lock b/src/Web/WebSPA/Client/yarn.lock
diff --git a/src/Web/WebStatus/Startup.cs b/src/Web/WebStatus/Startup.cs
diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj
diff --git a/src/Web/WebhookClient/Startup.cs b/src/Web/WebhookClient/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ await strategy.ExecuteAsync(async () =>`
`35`	`35`	`{`
`36`	`36`	`Guid transactionId;`
`37`	`37`
`38`		`- using var transaction = await _dbContext.BeginTransactionAsync();`
	`38`	`+ await using var transaction = await _dbContext.BeginTransactionAsync();`
`39`	`39`	`using (LogContext.PushProperty("TransactionContext", transaction.TransactionId))`
`40`	`40`	`{`
`41`	`41`	`_logger.LogInformation("----- Begin transaction {TransactionId} for {CommandName} ({@Command})", transaction.TransactionId, typeName, request);`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ public static IServiceCollection AddCustomMvc(this IServiceCollection services)`
`134`	`134`	`})`
`135`	`135`	`// Added for functional tests`
`136`	`136`	`.AddApplicationPart(typeof(OrdersController).Assembly)`
`137`		`- .AddJsonOptions(options => options.JsonSerializerOptions.WriteIndented = true)`
`138`		`- .SetCompatibilityVersion(CompatibilityVersion.Version_3_0);`
	`137`	`+ .AddJsonOptions(options => options.JsonSerializerOptions.WriteIndented = true);`
`139`	`138`
`140`	`139`	`services.AddCors(options =>`
`141`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public async Task CommitTransactionAsync(IDbContextTransaction transaction)`
`72`	`72`	`try`
`73`	`73`	`{`
`74`	`74`	`await SaveChangesAsync();`
`75`		`- transaction.Commit();`
	`75`	`+ await transaction.CommitAsync();`
`76`	`76`	`}`
`77`	`77`	`catch`
`78`	`78`	`{`
`@@ -128,7 +128,7 @@ public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamRequest<TRespo`
`128`	`128`	`return default(IAsyncEnumerable<object?>);`
`129`	`129`	`}`
`130`	`130`
`131`		`- public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default(CancellationToken)) where TNotification : INotification`
	`131`	`+ public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default) where TNotification : INotification`
`132`	`132`	`{`
`133`	`133`	`return Task.CompletedTask;`
`134`	`134`	`}`
`@@ -138,7 +138,7 @@ public Task Publish(object notification, CancellationToken cancellationToken = d`
`138`	`138`	`return Task.CompletedTask;`
`139`	`139`	`}`
`140`	`140`
`141`		`- public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default(CancellationToken))`
	`141`	`+ public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)`
`142`	`142`	`{`
`143`	`143`	`return Task.FromResult<TResponse>(default(TResponse));`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,8 @@ public Buyer Add(Buyer buyer)`
`19`	`19`	`.Add(buyer)`
`20`	`20`	`.Entity;`
`21`	`21`	`}`
`22`		`- else`
`23`		`- {`
`24`		`- return buyer;`
`25`		`- }`
	`22`	`+`
	`23`	`+ return buyer;`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`public Buyer Update(Buyer buyer)`