net6conversion (dotnet-architecture#642)

* Converting to net6 startup and integration test formats * Update to minimal api and using pagetitle * Adjust functional test fixtures Update ApiEndpoints package version * Finish migration to minimal api startup
weiyilai · Dec 6, 2021 · ce63e38 · ce63e38
1 parent 20b060a
commit ce63e38
Show file tree

Hide file tree

Showing 34 changed files with 485 additions and 714 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -58,13 +58,23 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 ###############################
 # Style Definitions
 dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
-# Use PascalCase for constant fields  
+# Use PascalCase for constant fields
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
 dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
 dotnet_naming_symbols.constant_fields.applicable_kinds            = field
 dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
 dotnet_naming_symbols.constant_fields.required_modifiers          = const
+
+# Instance fields are camelCase and start with _
+dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
+dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
+
+dotnet_naming_symbols.instance_fields.applicable_kinds = field
+
+dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _
 ###############################
 # C# Coding Conventions       #
 ###############################

diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{419A6ACE-0419-4315-A6FB-B0E63D39432E}"
 EndProject
@@ -23,6 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "tests\Fu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0BD72BEA-EF42-4B72-8B69-12A39EC76FBA}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		docker-compose.override.yml = docker-compose.override.yml
 		docker-compose.yml = docker-compose.yml
 		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml

diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor
@@ -3,6 +3,8 @@
 @inherits BlazorAdmin.Helpers.BlazorComponent
 @namespace BlazorAdmin.Pages.CatalogItemPage
 
+<PageTitle>eShopOnWeb Admin: Manage Product Catalog</PageTitle>
+
 <h1>Manage Product Catalog</h1>
 
 @if (catalogItems == null)

diff --git a/src/BlazorAdmin/Program.cs b/src/BlazorAdmin/Program.cs
@@ -1,54 +1,49 @@
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
+using BlazorAdmin;
 using BlazorAdmin.Services;
 using Blazored.LocalStorage;
 using BlazorShared;
 using BlazorShared.Models;
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace BlazorAdmin;
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#admin");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
-public class Program
-{
-    public static async Task Main(string[] args)
-    {
-        var builder = WebAssemblyHostBuilder.CreateDefault(args);
-        builder.RootComponents.Add<App>("#admin");
-
-        var configSection = builder.Configuration.GetRequiredSection(BaseUrlConfiguration.CONFIG_NAME);
-        builder.Services.Configure<BaseUrlConfiguration>(configSection);
+var configSection = builder.Configuration.GetRequiredSection(BaseUrlConfiguration.CONFIG_NAME);
+builder.Services.Configure<BaseUrlConfiguration>(configSection);
 
-        builder.Services.AddScoped(sp => new HttpClient() { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped(sp => new HttpClient() { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
-        builder.Services.AddScoped<ToastService>();
-        builder.Services.AddScoped<HttpService>();
+builder.Services.AddScoped<ToastService>();
+builder.Services.AddScoped<HttpService>();
 
-        builder.Services.AddBlazoredLocalStorage();
+builder.Services.AddBlazoredLocalStorage();
 
-        builder.Services.AddAuthorizationCore();
-        builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthStateProvider>();
-        builder.Services.AddScoped(sp => (CustomAuthStateProvider)sp.GetRequiredService<AuthenticationStateProvider>());
+builder.Services.AddAuthorizationCore();
+builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthStateProvider>();
+builder.Services.AddScoped(sp => (CustomAuthStateProvider)sp.GetRequiredService<AuthenticationStateProvider>());
 
-        builder.Services.AddBlazorServices();
+builder.Services.AddBlazorServices();
 
-        builder.Logging.AddConfiguration(builder.Configuration.GetRequiredSection("Logging"));
+builder.Logging.AddConfiguration(builder.Configuration.GetRequiredSection("Logging"));
 
-        await ClearLocalStorageCache(builder.Services);
+await ClearLocalStorageCache(builder.Services);
 
-        await builder.Build().RunAsync();
-    }
+await builder.Build().RunAsync();
 
-    private static async Task ClearLocalStorageCache(IServiceCollection services)
-    {
-        var sp = services.BuildServiceProvider();
-        var localStorageService = sp.GetRequiredService<ILocalStorageService>();
+static async Task ClearLocalStorageCache(IServiceCollection services)
+{
+    var sp = services.BuildServiceProvider();
+    var localStorageService = sp.GetRequiredService<ILocalStorageService>();
 
-        await localStorageService.RemoveItemAsync(typeof(CatalogBrand).Name);
-        await localStorageService.RemoveItemAsync(typeof(CatalogType).Name);
-    }
+    await localStorageService.RemoveItemAsync(typeof(CatalogBrand).Name);
+    await localStorageService.RemoveItemAsync(typeof(CatalogType).Name);
 }
diff --git a/src/Infrastructure/Data/CatalogContextSeed.cs b/src/Infrastructure/Data/CatalogContextSeed.cs
@@ -10,7 +10,8 @@ namespace Microsoft.eShopWeb.Infrastructure.Data;
 public class CatalogContextSeed
 {
     public static async Task SeedAsync(CatalogContext catalogContext,
-        ILoggerFactory loggerFactory, int retry = 0)
+        ILogger logger,
+        int retry = 0)
     {
         var retryForAvailability = retry;
         try
@@ -49,9 +50,9 @@ await catalogContext.CatalogItems.AddRangeAsync(
             if (retryForAvailability >= 10) throw;
 
             retryForAvailability++;
-            var log = loggerFactory.CreateLogger<CatalogContextSeed>();
-            log.LogError(ex.Message);
-            await SeedAsync(catalogContext, loggerFactory, retryForAvailability);
+
+            logger.LogError(ex.Message);
+            await SeedAsync(catalogContext, logger, retryForAvailability);
             throw;
         }
     }

diff --git a/src/PublicApi/AuthEndpoints/Authenticate.cs b/src/PublicApi/AuthEndpoints/Authenticate.cs
@@ -9,9 +9,9 @@
 
 namespace Microsoft.eShopWeb.PublicApi.AuthEndpoints;
 
-public class Authenticate : BaseAsyncEndpoint
+public class Authenticate : EndpointBaseAsync
     .WithRequest<AuthenticateRequest>
-    .WithResponse<AuthenticateResponse>
+    .WithActionResult<AuthenticateResponse>
 {
     private readonly SignInManager<ApplicationUser> _signInManager;
     private readonly ITokenClaimsService _tokenClaimsService;

diff --git a/src/PublicApi/CatalogBrandEndpoints/List.cs b/src/PublicApi/CatalogBrandEndpoints/List.cs
@@ -10,9 +10,9 @@
 
 namespace Microsoft.eShopWeb.PublicApi.CatalogBrandEndpoints;
 
-public class List : BaseAsyncEndpoint
+public class List : EndpointBaseAsync
     .WithoutRequest
-    .WithResponse<ListCatalogBrandsResponse>
+    .WithActionResult<ListCatalogBrandsResponse>
 {
     private readonly IRepository<CatalogBrand> _catalogBrandRepository;
     private readonly IMapper _mapper;

diff --git a/src/PublicApi/CatalogItemEndpoints/Create.cs b/src/PublicApi/CatalogItemEndpoints/Create.cs
@@ -13,9 +13,9 @@
 namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints;
 
 [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-public class Create : BaseAsyncEndpoint
+public class Create : EndpointBaseAsync
     .WithRequest<CreateCatalogItemRequest>
-    .WithResponse<CreateCatalogItemResponse>
+    .WithActionResult<CreateCatalogItemResponse>
 {
     private readonly IRepository<CatalogItem> _itemRepository;
     private readonly IUriComposer _uriComposer;

diff --git a/src/PublicApi/CatalogItemEndpoints/Delete.cs b/src/PublicApi/CatalogItemEndpoints/Delete.cs
@@ -11,9 +11,9 @@
 namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints;
 
 [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-public class Delete : BaseAsyncEndpoint
+public class Delete : EndpointBaseAsync
     .WithRequest<DeleteCatalogItemRequest>
-    .WithResponse<DeleteCatalogItemResponse>
+    .WithActionResult<DeleteCatalogItemResponse>
 {
     private readonly IRepository<CatalogItem> _itemRepository;
 

diff --git a/src/PublicApi/CatalogItemEndpoints/GetById.cs b/src/PublicApi/CatalogItemEndpoints/GetById.cs
@@ -8,9 +8,9 @@
 
 namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints;
 
-public class GetById : BaseAsyncEndpoint
+public class GetById : EndpointBaseAsync
     .WithRequest<GetByIdCatalogItemRequest>
-    .WithResponse<GetByIdCatalogItemResponse>
+    .WithActionResult<GetByIdCatalogItemResponse>
 {
     private readonly IRepository<CatalogItem> _itemRepository;
     private readonly IUriComposer _uriComposer;

diff --git a/src/PublicApi/CatalogItemEndpoints/ListPaged.cs b/src/PublicApi/CatalogItemEndpoints/ListPaged.cs
@@ -12,9 +12,9 @@
 
 namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints;
 
-public class ListPaged : BaseAsyncEndpoint
+public class ListPaged : EndpointBaseAsync
     .WithRequest<ListPagedCatalogItemRequest>
-    .WithResponse<ListPagedCatalogItemResponse>
+    .WithActionResult<ListPagedCatalogItemResponse>
 {
     private readonly IRepository<CatalogItem> _itemRepository;
     private readonly IUriComposer _uriComposer;

diff --git a/src/PublicApi/CatalogItemEndpoints/Update.cs b/src/PublicApi/CatalogItemEndpoints/Update.cs
@@ -12,9 +12,9 @@
 namespace Microsoft.eShopWeb.PublicApi.CatalogItemEndpoints;
 
 [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS, AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-public class Update : BaseAsyncEndpoint
+public class Update : EndpointBaseAsync
     .WithRequest<UpdateCatalogItemRequest>
-    .WithResponse<UpdateCatalogItemResponse>
+    .WithActionResult<UpdateCatalogItemResponse>
 {
     private readonly IRepository<CatalogItem> _itemRepository;
     private readonly IUriComposer _uriComposer;

diff --git a/src/PublicApi/CatalogTypeEndpoints/List.cs b/src/PublicApi/CatalogTypeEndpoints/List.cs
@@ -10,9 +10,9 @@
 
 namespace Microsoft.eShopWeb.PublicApi.CatalogTypeEndpoints;
 
-public class List : BaseAsyncEndpoint
+public class List : EndpointBaseAsync
     .WithoutRequest
-    .WithResponse<ListCatalogTypesResponse>
+    .WithActionResult<ListCatalogTypesResponse>
 {
     private readonly IRepository<CatalogType> _catalogTypeRepository;
     private readonly IMapper _mapper;

diff --git a/...licApi/MiddleWares/ExceptionMiddleware.cs → ...blicApi/Middleware/ExceptionMiddleware.cs b/...licApi/MiddleWares/ExceptionMiddleware.cs → ...blicApi/Middleware/ExceptionMiddleware.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.eShopWeb.ApplicationCore.Exceptions;
 
-namespace Microsoft.eShopWeb.PublicApi.MiddleWares;
+namespace Microsoft.eShopWeb.PublicApi.Middleware;
 
 public class ExceptionMiddleware
 {