Upgraded MudBlazor Templates to .NET 9

MudBlazor · Nov 15, 2024 · 3cb4418 · 3cb4418
1 parent 02309da
commit 3cb4418
Show file tree

Hide file tree

Showing 36 changed files with 118 additions and 547 deletions.
diff --git a/src/MudBlazor.Templates.csproj b/src/MudBlazor.Templates.csproj
@@ -18,7 +18,7 @@
 
     <!-- Keep package type as 'Template' to show the package as a template package on nuget.org and make your template available in dotnet new search.-->
     <PackageType>Template</PackageType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <ContentTargetFolders>content</ContentTargetFolders>

diff --git a/src/mudblazor/.template.config/dotnetcli.host.json b/src/mudblazor/.template.config/dotnetcli.host.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "$schema": "https://json.schemastore.org/dotnetcli.host",
   "symbolInfo": {
     "skipRestore": {
       "longName": "no-restore",

diff --git a/src/mudblazor/.template.config/ide.host.json b/src/mudblazor/.template.config/ide.host.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json.schemastore.org/ide.host",
+  "$schema": "https://json.schemastore.org/ide.host",
   "order": 610,
   "icon": "icon.png",
   "disableHttpsSymbol": "NoHttps",

diff --git a/src/mudblazor/.template.config/template.json b/src/mudblazor/.template.config/template.json
@@ -18,7 +18,7 @@
     "650B3CE7-2E93-4CC4-9F46-466686815EAA",
     "53bc9b9d-9d6a-45d4-8429-2a2761773502"
   ],
-  "identity": "MudBlazorWebApp.CSharp.8.0",
+  "identity": "MudBlazorWebApp.CSharp.10.0",
   "thirdPartyNotices": "",
   "preferNameDirectory": true,
   "primaryOutputs": [
@@ -52,13 +52,7 @@
         "**/wwwroot/bootstrap/**"
       ],
       "modifiers": [
-        {
-          "condition": "(!IndividualLocalAuth)",
-          "exclude": [
-            "**/wwwroot/bootstrap/**"
-          ]
-        },
-        {
+        {       
           "condition": "(!UseWebAssembly)",
           "exclude": [
             "MudBlazor.Template.Client/**",
@@ -73,6 +67,7 @@
           "rename": {
             "MudBlazor.Template/Components/Layout/": "./MudBlazor.Template.Client/Layout/",
             "MudBlazor.Template/Components/Pages/Home.razor": "./MudBlazor.Template.Client/Pages/Home.razor",
+            "MudBlazor.Template/Components/Pages/Weather.razor": "./MudBlazor.Template.Client/Pages/Weather.razor",
             "MudBlazor.Template/Components/Routes.razor": "./MudBlazor.Template.Client/Routes.razor"
           }
         },
@@ -94,10 +89,9 @@
           }
         },
         {
-          "condition": "(UseWebAssembly || (!UseWebAssembly && !UseServer))",
+          "condition": "(!(UseServer && !UseWebAssembly))",
           "exclude": [
-            "MudBlazor.Template/Components/Pages/Counter.razor",
-            "MudBlazor.Template/Components/Pages/Weather.razor"
+            "MudBlazor.Template/Components/Pages/Counter.razor"
           ]
         },
         {
@@ -130,7 +124,6 @@
           "exclude": [
             "MudBlazor.Template/Components/Account/**",
             "MudBlazor.Template/Data/**",
-            "MudBlazor.Template.Client/PersistentAuthenticationStateProvider.cs",
             "MudBlazor.Template.Client/UserInfo.cs",
             "MudBlazor.Template.Client/Pages/Auth.razor"
           ]
@@ -148,24 +141,12 @@
           ]
         },
         {
-          "condition": "(!(IndividualLocalAuth && UseServer && UseWebAssembly))",
-          "exclude": [
-            "MudBlazor.Template/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs"
-          ]
-        },
-        {
-          "condition": "(!(IndividualLocalAuth && UseServer && !UseWebAssembly))",
+          "condition": "(!(IndividualLocalAuth && UseServer))",
           "exclude": [
             "MudBlazor.Template/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
           ]
         },
-        {
-          "condition": "(!(IndividualLocalAuth && !UseServer && UseWebAssembly))",
-          "exclude": [
-            "MudBlazor.Template/Components/Account/PersistingServerAuthenticationStateProvider.cs"
-          ]
-        },
-        {
+        {       
           "condition": "(IndividualLocalAuth && UseLocalDB && UseWebAssembly)",
           "rename": {
             "MudBlazor.Template/Data/SqlServer/": "MudBlazor.Template/Data/Migrations/"
@@ -217,12 +198,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net8.0",
-          "description": "Target net8.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net8.0",
-      "defaultValue": "net8.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "HostIdentifier": {
       "type": "bind",
@@ -364,7 +345,7 @@
       "type": "parameter",
       "datatype": "choice",
       "defaultValue": "InteractiveGlobal",
-      "displayName": "_Interactivity location",
+      "displayName": "Interactivity _location",
       "description": "Chooses which components will have interactive rendering enabled",
       "isEnabled": "(InteractivityPlatform != \"None\")",
       "choices": [
@@ -392,7 +373,7 @@
       "type": "parameter",
       "datatype": "bool",
       "defaultValue": "true",
-      "displayName": "_Include sample pages",
+      "displayName": "Include _sample pages",
       "description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns."
     },
     "Empty": {

diff --git a/src/mudblazor/MudBlazor.Template.Client/MudBlazor.Template.Client.csproj b/src/mudblazor/MudBlazor.Template.Client/MudBlazor.Template.Client.csproj
diff --git a/src/mudblazor/MudBlazor.Template.Client/Pages/Weather.razor b/src/mudblazor/MudBlazor.Template.Client/Pages/Weather.razor
diff --git a/src/mudblazor/MudBlazor.Template.Client/PersistentAuthenticationStateProvider.cs b/src/mudblazor/MudBlazor.Template.Client/PersistentAuthenticationStateProvider.cs
diff --git a/src/mudblazor/MudBlazor.Template.Client/Program.Main.cs b/src/mudblazor/MudBlazor.Template.Client/Program.Main.cs
@@ -1,7 +1,3 @@
-#if (IndividualLocalAuth)
-using MudBlazor.Template.Client;
-using Microsoft.AspNetCore.Components.Authorization;
-#endif
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MudBlazor.Services;
 
@@ -12,16 +8,14 @@ class Program
     static async Task Main(string[] args)
     {
         var builder = WebAssemblyHostBuilder.CreateDefault(args);
-
-        builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
         builder.Services.AddMudServices();
 
 #if (IndividualLocalAuth)
         builder.Services.AddAuthorizationCore();
         builder.Services.AddCascadingAuthenticationState();
-        builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
-#endif
+        builder.Services.AddAuthenticationStateDeserialization();
 
+        #endif
         await builder.Build().RunAsync();
     }
 }
diff --git a/src/mudblazor/MudBlazor.Template.Client/Program.cs b/src/mudblazor/MudBlazor.Template.Client/Program.cs
@@ -1,19 +1,14 @@
-#if (IndividualLocalAuth)
-using MudBlazor.Template.Client;
-using Microsoft.AspNetCore.Components.Authorization;
-#endif
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MudBlazor.Services;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddMudServices();
 
 #if (IndividualLocalAuth)
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
-builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
+builder.Services.AddAuthenticationStateDeserialization();
 
 #endif
 await builder.Build().RunAsync();
diff --git a/src/mudblazor/MudBlazor.Template.Client/UserInfo.cs b/src/mudblazor/MudBlazor.Template.Client/UserInfo.cs
diff --git a/...MudBlazor.Template/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/...MudBlazor.Template/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -42,7 +42,7 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
 
         accountGroup.MapPost("/Logout", async (
             ClaimsPrincipal user,
-            SignInManager<ApplicationUser> signInManager,
+            [FromServices] SignInManager<ApplicationUser> signInManager,
             [FromForm] string returnUrl) =>
         {
             await signInManager.SignOutAsync();

diff --git a/src/mudblazor/MudBlazor.Template/Components/Account/Pages/ExternalLogin.razor b/src/mudblazor/MudBlazor.Template/Components/Account/Pages/ExternalLogin.razor
@@ -35,8 +35,8 @@
             <DataAnnotationsValidator />
             <ValidationSummary class="text-danger" role="alert" />
             <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.Email" class="form-control" autocomplete="email" placeholder="Please enter your email." />
-                <label for="email" class="form-label">Email</label>
+                <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="email" placeholder="Please enter your email." />
+                <label for="Input.Email" class="form-label">Email</label>
                 <ValidationMessage For="() => Input.Email" />
             </div>
             <button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
@@ -48,7 +48,7 @@
     public const string LoginCallbackAction = "LoginCallback";
 
     private string? message;
-    private ExternalLoginInfo externalLoginInfo = default!;
+    private ExternalLoginInfo? externalLoginInfo;
 
     [CascadingParameter]
     private HttpContext HttpContext { get; set; } = default!;
@@ -65,7 +65,7 @@
     [SupplyParameterFromQuery]
     private string? Action { get; set; }
 
-    private string? ProviderDisplayName => externalLoginInfo.ProviderDisplayName;
+    private string? ProviderDisplayName => externalLoginInfo?.ProviderDisplayName;
 
     protected override async Task OnInitializedAsync()
     {
@@ -98,6 +98,11 @@
 
     private async Task OnLoginCallbackAsync()
     {
+        if (externalLoginInfo is null)
+        {
+            RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
+        }
+
         // Sign in the user with this external login provider if the user already has a login.
         var result = await SignInManager.ExternalLoginSignInAsync(
             externalLoginInfo.LoginProvider,
@@ -127,6 +132,11 @@
 
     private async Task OnValidSubmitAsync()
     {
+        if (externalLoginInfo is null)
+        {
+            RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information during confirmation.", HttpContext);
+        }
+
         var emailStore = GetEmailStore();
         var user = CreateUser();