Added implict usings

src/ApiGateways/Mobile.Bff.Shopping/aggregator/GlobalUsings.cs

@@ -1,24 +1,13 @@
-global using CatalogApi;
-global using Grpc.Core.Interceptors;
+global using System.Text.Json;
+global using CatalogApi;
 global using Grpc.Core;
+global using Grpc.Core.Interceptors;
 global using GrpcBasket;
 global using Microsoft.AspNetCore.Authorization;
-global using Microsoft.AspNetCore.Builder;
-global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Infrastructure;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
 global using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services;
-global using Microsoft.Extensions.Configuration;
-global using Microsoft.Extensions.DependencyInjection;
-global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Net.Http;
-global using System.Net;
-global using System.Text.Json;
-global using System.Threading.Tasks;
-global using System;
 global using Services.Common;

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

@@ -5,31 +5,15 @@
     <AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
-    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
-    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>    
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="wwwroot\**" />
-    <Content Remove="wwwroot\**" />
-    <EmbeddedResource Remove="wwwroot\**" />
-    <None Remove="wwwroot\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Yarp.ReverseProxy" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" />
     <PackageReference Include="Google.Protobuf" />
     <PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" />
-    <PackageReference Include="Grpc.Core" />
-    <PackageReference Include="Grpc.Net.ClientFactory" />
     <PackageReference Include="Grpc.Tools" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>

src/ApiGateways/Web.Bff.Shopping/aggregator/GlobalUsings.cs

@@ -1,27 +1,13 @@
-global using System;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Net;
-global using System.Net.Http;
-global using System.Net.Http.Headers;
-global using System.Text.Json;
-global using System.Threading;
-global using System.Threading.Tasks;
+global using System.Text.Json;
 global using CatalogApi;
 global using Grpc.Core;
 global using Grpc.Core.Interceptors;
 global using GrpcBasket;
-global using Microsoft.AspNetCore.Authentication;
 global using Microsoft.AspNetCore.Authorization;
-global using Microsoft.AspNetCore.Builder;
-global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
 global using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-global using Microsoft.Extensions.Configuration;
-global using Microsoft.Extensions.DependencyInjection;
-global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Services.Common;

src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>Web.Shopping.HttpAggregator</AssemblyName>
     <RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBus/EventBus.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBus</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBus/GlobalUsings.cs

@@ -1,8 +1,4 @@
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using System.Text.Json.Serialization;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 global using static Microsoft.eShopOnContainers.BuildingBlocks.EventBus.InMemoryEventBusSubscriptionsManager;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Text.Json.Serialization;
-global using System.Threading.Tasks;
-global using System;

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBusRabbitMQ/GlobalUsings.cs

@@ -1,16 +1,13 @@
-global using Microsoft.Extensions.Logging;
+global using System.Net.Sockets;
+global using System.Text;
+global using System.Text.Json;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Extensions;
+global using Microsoft.Extensions.Logging;
 global using Polly;
 global using Polly.Retry;
 global using RabbitMQ.Client;
 global using RabbitMQ.Client.Events;
 global using RabbitMQ.Client.Exceptions;
-global using System;
-global using System.IO;
-global using System.Net.Sockets;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Extensions;
-global using System.Text;
-global using System.Threading.Tasks;
-global using System.Text.Json;

src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBusServiceBus/GlobalUsings.cs

@@ -1,13 +1,11 @@
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-global using System.Threading.Tasks;
-global using System;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
-global using Microsoft.Extensions.Logging;
-global using System.Text;
+global using System.Text;
 global using System.Text.Json;
 global using Azure.Messaging.ServiceBus;
 global using Azure.Messaging.ServiceBus.Administration;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+global using Microsoft.Extensions.Logging;
 
 
 

src/BuildingBlocks/EventBus/IntegrationEventLogEF/GlobalUsings.cs

@@ -1,12 +1,8 @@
-global using Microsoft.EntityFrameworkCore;
-global using Microsoft.EntityFrameworkCore.Metadata.Builders;
-global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-global using System;
-global using System.Text.Json;
-global using System.ComponentModel.DataAnnotations.Schema;
-global using System.Linq;
-global using System.Threading.Tasks;
-global using Microsoft.EntityFrameworkCore.Storage;
-global using System.Collections.Generic;
+global using System.ComponentModel.DataAnnotations.Schema;
 global using System.Data.Common;
 global using System.Reflection;
+global using System.Text.Json;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.Metadata.Builders;
+global using Microsoft.EntityFrameworkCore.Storage;
+global using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj

@@ -2,23 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 
-    <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+  <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
-    <PackageReference Include="Microsoft.NETCore.Platforms" />
     <PackageReference Include="Polly" />
     <PackageReference Include="System.Data.SqlClient" />
   </ItemGroup>

src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs

@@ -1,77 +1,75 @@
-using System;
-using System.Data.SqlClient;
+using System.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Polly;
 
-namespace Microsoft.AspNetCore.Hosting
+namespace Microsoft.AspNetCore.Hosting;
+
+public static class IWebHostExtensions
 {
-    public static class IWebHostExtensions
+    public static bool IsInKubernetes(this IServiceProvider services)
     {
-        public static bool IsInKubernetes(this IServiceProvider services)
-        {
-            var cfg = services.GetService<IConfiguration>();
-            var orchestratorType = cfg.GetValue<string>("OrchestratorType");
-            return orchestratorType?.ToUpper() == "K8S";
-        }
-
-        public static IServiceProvider MigrateDbContext<TContext>(this IServiceProvider services, Action<TContext, IServiceProvider> seeder) where TContext : DbContext
-        {
-            var underK8s = services.IsInKubernetes();
-
-            using var scope = services.CreateScope();
-            var scopeServices = scope.ServiceProvider;
-            var logger = scopeServices.GetRequiredService<ILogger<TContext>>();
-            var context = scopeServices.GetService<TContext>();
+        var cfg = services.GetService<IConfiguration>();
+        var orchestratorType = cfg.GetValue<string>("OrchestratorType");
+        return orchestratorType?.ToUpper() == "K8S";
+    }
 
-            try
-            {
-                logger.LogInformation("Migrating database associated with context {DbContextName}", typeof(TContext).Name);
+    public static IServiceProvider MigrateDbContext<TContext>(this IServiceProvider services, Action<TContext, IServiceProvider> seeder) where TContext : DbContext
+    {
+        var underK8s = services.IsInKubernetes();
 
-                if (underK8s)
-                {
-                    InvokeSeeder(seeder, context, scopeServices);
-                }
-                else
-                {
-                    var retries = 10;
-                    var retry = Policy.Handle<SqlException>()
-                        .WaitAndRetry(
-                            retryCount: retries,
-                            sleepDurationProvider: retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
-                            onRetry: (exception, timeSpan, retry, ctx) =>
-                            {
-                                logger.LogWarning(exception, "[{prefix}] Error migrating database (attempt {retry} of {retries})", nameof(TContext), retry, retries);
-                            });
+        using var scope = services.CreateScope();
+        var scopeServices = scope.ServiceProvider;
+        var logger = scopeServices.GetRequiredService<ILogger<TContext>>();
+        var context = scopeServices.GetService<TContext>();
 
-                    //if the sql server container is not created on run docker compose this
-                    //migration can't fail for network related exception. The retry options for DbContext only 
-                    //apply to transient exceptions
-                    // Note that this is NOT applied when running some orchestrators (let the orchestrator to recreate the failing service)
-                    retry.Execute(() => InvokeSeeder(seeder, context, scopeServices));
-                }
+        try
+        {
+            logger.LogInformation("Migrating database associated with context {DbContextName}", typeof(TContext).Name);
 
-                logger.LogInformation("Migrated database associated with context {DbContextName}", typeof(TContext).Name);
+            if (underK8s)
+            {
+                InvokeSeeder(seeder, context, scopeServices);
             }
-            catch (Exception ex)
+            else
             {
-                logger.LogError(ex, "An error occurred while migrating the database used on context {DbContextName}", typeof(TContext).Name);
-                if (underK8s)
-                {
-                    throw;          // Rethrow under k8s because we rely on k8s to re-run the pod
-                }
+                var retries = 10;
+                var retry = Policy.Handle<SqlException>()
+                    .WaitAndRetry(
+                        retryCount: retries,
+                        sleepDurationProvider: retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
+                        onRetry: (exception, timeSpan, retry, ctx) =>
+                        {
+                            logger.LogWarning(exception, "[{prefix}] Error migrating database (attempt {retry} of {retries})", nameof(TContext), retry, retries);
+                        });
+
+                //if the sql server container is not created on run docker compose this
+                //migration can't fail for network related exception. The retry options for DbContext only 
+                //apply to transient exceptions
+                // Note that this is NOT applied when running some orchestrators (let the orchestrator to recreate the failing service)
+                retry.Execute(() => InvokeSeeder(seeder, context, scopeServices));
             }
 
-            return services;
+            logger.LogInformation("Migrated database associated with context {DbContextName}", typeof(TContext).Name);
         }
-
-        private static void InvokeSeeder<TContext>(Action<TContext, IServiceProvider> seeder, TContext context, IServiceProvider services)
-            where TContext : DbContext
+        catch (Exception ex)
         {
-            context.Database.Migrate();
-            seeder(context, services);
+            logger.LogError(ex, "An error occurred while migrating the database used on context {DbContextName}", typeof(TContext).Name);
+            if (underK8s)
+            {
+                throw;          // Rethrow under k8s because we rely on k8s to re-run the pod
+            }
         }
+
+        return services;
+    }
+
+    private static void InvokeSeeder<TContext>(Action<TContext, IServiceProvider> seeder, TContext context, IServiceProvider services)
+        where TContext : DbContext
+    {
+        context.Database.Migrate();
+        seeder(context, services);
     }
 }

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <UserSecretsId>2964ec8e-0d48-4541-b305-94cab537f867</UserSecretsId>
   </PropertyGroup>