Repair .NET 10 and MudBlazor migration

.github/workflows/tls-lifecycle.yml

@@ -3,17 +3,13 @@ name: TLS lifecycle tests
 on:
   pull_request:
     paths:
-      - "TruthGate-Web/TruthGate-Web/Configuration/**"
-      - "TruthGate-Web/TruthGate-Web/Services/ConfigWatchAndIssueService.cs"
-      - "TruthGate-Web/TruthGate-Web.Tests/**"
+      - "TruthGate-Web/**"
       - ".github/workflows/tls-lifecycle.yml"
   push:
     branches:
       - master
     paths:
-      - "TruthGate-Web/TruthGate-Web/Configuration/**"
-      - "TruthGate-Web/TruthGate-Web/Services/ConfigWatchAndIssueService.cs"
-      - "TruthGate-Web/TruthGate-Web.Tests/**"
+      - "TruthGate-Web/**"
       - ".github/workflows/tls-lifecycle.yml"
 
 jobs:
@@ -25,37 +21,22 @@ jobs:
 
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "9.0.x"
+          dotnet-version: "10.0.x"
 
-      - name: Restore
+      - name: Restore solution
+        run: dotnet restore TruthGate-IPFS.sln
+
+      # This test project is intentionally outside TruthGate-IPFS.sln, so restore it explicitly.
+      - name: Restore TLS tests
         run: dotnet restore TruthGate-Web/TruthGate-Web.Tests/TruthGate-Web.Tests.csproj
 
-      - name: Test
-        id: test
-        shell: bash
-        run: |
-          set +e
-          dotnet test \
-            TruthGate-Web/TruthGate-Web.Tests/TruthGate-Web.Tests.csproj \
-            --no-restore \
-            --configuration Release \
-            --logger "console;verbosity=normal" \
-            > tls-test-output.log 2>&1
-          status=$?
-          echo "status=$status" >> "$GITHUB_OUTPUT"
-          exit 0
-
-      - name: Upload test diagnostics
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: tls-test-output
-          path: tls-test-output.log
-          if-no-files-found: error
-
-      - name: Report failure
-        if: steps.test.outputs.status != '0'
-        shell: bash
-        run: |
-          echo "TLS lifecycle tests failed. Download the tls-test-output artifact for the complete compiler/test diagnostics."
-          exit 1
+      - name: Build solution
+        run: dotnet build TruthGate-IPFS.sln --no-restore --configuration Release
+
+      - name: Test TLS lifecycle
+        run: >-
+          dotnet test
+          TruthGate-Web/TruthGate-Web.Tests/TruthGate-Web.Tests.csproj
+          --no-restore
+          --configuration Release
+          --logger "console;verbosity=normal"

TruthGate-Web/TruthGate-Web.Tests/TruthGate-Web.Tests.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

TruthGate-Web/TruthGate-Web/Components/Pages/Settings/ApiKeys.razor

@@ -1,4 +1,4 @@
-@page "/keys"
+@page "/keys"
 @using TruthGate_Web.Components.Pages.Settings.Shared
 @using TruthGate_Web.Models
 @using TruthGate_Web.Utils
@@ -71,10 +71,10 @@
             { x => x.ExistingNames, _keys.Select(k => k.Name).ToList() }
         };
 
-        var dialog = await Dialogs.ShowAsync("Add API Key", p, new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small, FullWidth = true });
+        var dialog = await Dialogs.ShowAsync<AddApiKeyDialog>("Add API Key", p, new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small, FullWidth = true });
         var result = await dialog.Result;
 
-        if (result.Canceled || result.Data is not AddApiKeyDialog.AddApiKeyResult r) return;
+        if (result is null || result.Canceled || result.Data is not AddApiKeyDialog.AddApiKeyResult r) return;
 
         // Final uniqueness check (server-side)
         if (_keys.Any(k => string.Equals(k.Name, r.Name, StringComparison.OrdinalIgnoreCase)))
@@ -106,7 +106,7 @@
         var dialog = await Dialogs.ShowAsync<ConfirmDeleteDialog>("Confirm Delete", p);
         var result = await dialog.Result;
 
-        if (result.Canceled || result.Data is not bool yes || !yes) return;
+        if (result is null || result.Canceled || result.Data is not bool yes || !yes) return;
 
         await ConfigSvc.UpdateAsync(cfg =>
         {

TruthGate-Web/TruthGate-Web/Components/Pages/Settings/Domains.razor

@@ -1,4 +1,4 @@
-@page "/domains"
+@page "/domains"
 @using System.Globalization
 @using System.Text.RegularExpressions
 @using MudBlazor
@@ -47,7 +47,7 @@
                 @context.Domain
                 @if (!string.IsNullOrWhiteSpace(context.RedirectUrl))
                 {
-                    <MudText Typo="Typo.caption" Class="truncate-text" Title="@context.RedirectUrl">
+                    <MudText Typo="Typo.caption" Class="truncate-text" title="@context.RedirectUrl">
                         @{
                             var u = context.RedirectUrl ?? string.Empty;
                         }
@@ -60,7 +60,7 @@
 
                     <MudStack Row="true" Spacing="1" Class="mt-1">
                         <MudTooltip Text="@($"{GetLabel(context)}.{_wildcardHost}")">
-                            <MudChip T="string" Color="Color.Primary" Variant="Variant.Outlined" StartIcon="@Icons.Material.Filled.Link">
+                            <MudChip T="string" Color="Color.Primary" Variant="Variant.Outlined" Icon="@Icons.Material.Filled.Link">
                                 @($"{GetIpnsHost(context, useShort: true)}")
                             </MudChip>
                         </MudTooltip>
@@ -88,7 +88,7 @@
                             @context.IpnsKeyName
                         </MudChip> *@
                         <MudTooltip Text="@context.IpnsPeerId">
-                            <MudChip T="string" Color="Color.Primary" Variant="Variant.Outlined" StartIcon="@Icons.Material.Filled.Fingerprint">
+                            <MudChip T="string" Color="Color.Primary" Variant="Variant.Outlined" Icon="@Icons.Material.Filled.Fingerprint">
                                 IPNS: @Short(context.IpnsPeerId)
                             </MudChip>
                         </MudTooltip>

TruthGate-Web/TruthGate-Web/Components/Pages/Settings/IpBansPage.razor

@@ -1,4 +1,4 @@
-@page "/ip-bans"
+@page "/ip-bans"
 @using Microsoft.EntityFrameworkCore
 @using System.Net
 @using TruthGate_Web.Components.Pages.Settings.Shared
@@ -52,7 +52,7 @@
                          Hover="true"
                          Dense="true"
                          Bordered="true"
-                         Sortable="false"
+                         SortMode="SortMode.None"
                          Filterable="false"
                          RowsPerPage="20">
                 <Columns>
@@ -118,7 +118,7 @@
                                  Hover="true"
                                  Dense="true"
                                  Bordered="true"
-                                 Sortable="false"
+                                 SortMode="SortMode.None"
                                  Filterable="false"
                                  RowsPerPage="20">
                         <Columns>
@@ -164,7 +164,7 @@
                                  Hover="true"
                                  Dense="true"
                                  Bordered="true"
-                                 Sortable="false"
+                                 SortMode="SortMode.None"
                                  Filterable="false"
                                  RowsPerPage="20">
                         <Columns>
@@ -212,7 +212,7 @@
     }
     private BanFilters _banFilters = new();
 
-    private async Task<GridData<BanDto>> LoadBansGridAsync(GridState<BanDto> state)
+    private async Task<GridData<BanDto>> LoadBansGridAsync(GridState<BanDto> state, CancellationToken cancellationToken)
     {
         var page = state.Page + 1;          // Mud uses 0-based; your API is 1-based
         var pageSize = state.PageSize;
@@ -237,7 +237,7 @@
 
     private async Task ConfirmUnbanById(Guid id)
     {
-        var res = await Dialogs.ShowMessageBox("Confirm", "Unban this entry?", yesText: "Unban", cancelText: "Cancel");
+        var res = await Dialogs.ShowMessageBoxAsync("Confirm", "Unban this entry?", yesText: "Unban", cancelText: "Cancel");
         if (res == true)
         {
             var ok = await RateSvc.UnbanByIdAsync(id);
@@ -248,7 +248,7 @@
 
     private async Task ConfirmUnbanIp(string ip)
     {
-        var res = await Dialogs.ShowMessageBox("Confirm", $"Unban IP {ip} ?", yesText: "Unban", cancelText: "Cancel");
+        var res = await Dialogs.ShowMessageBoxAsync("Confirm", $"Unban IP {ip} ?", yesText: "Unban", cancelText: "Cancel");
         if (res == true)
         {
             var ok = await RateSvc.UnbanIpAsync(ip);
@@ -259,7 +259,7 @@
 
     private async Task ConfirmUnbanPrefix(string pfx)
     {
-        var res = await Dialogs.ShowMessageBox("Confirm", $"Unban prefix {pfx} ?", yesText: "Unban", cancelText: "Cancel");
+        var res = await Dialogs.ShowMessageBoxAsync("Confirm", $"Unban prefix {pfx} ?", yesText: "Unban", cancelText: "Cancel");
         if (res == true)
         {
             var ok = await RateSvc.UnbanIpv6PrefixAsync(pfx);
@@ -272,13 +272,15 @@
     private async Task OpenSearchDialog()
     {
         var parameters = new DialogParameters<SearchDialogCtx> { { x => x.InitialIp, _banFilters.IpFilter } };
-        await Dialogs.ShowAsync<SearchIpDialog>("Search IP", parameters, new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }).Result;
+        var dialog = await Dialogs.ShowAsync<SearchIpDialog>("Search IP", parameters, new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small });
+        await dialog.Result;
     }
 
     // -------------------- ADD BAN DIALOG --------------------
     private async Task OpenAddBanDialog()
     {
-        await Dialogs.ShowAsync<AddBanDialog>("Add Ban", new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }).Result;
+        var dialog = await Dialogs.ShowAsync<AddBanDialog>("Add Ban", new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small });
+        await dialog.Result;
         await ReloadBans();
     }
 
@@ -289,9 +291,9 @@
     private string? _newWhitelistReason;
     private int? _newWhitelistExpireHours;
 
-    private async Task<GridData<Whitelist>> LoadWhitelistIpGridAsync(GridState<Whitelist> state)
+    private async Task<GridData<Whitelist>> LoadWhitelistIpGridAsync(GridState<Whitelist> state, CancellationToken cancellationToken)
     {
-        await using var db = await DbFactory.CreateDbContextAsync();
+        await using var db = await DbFactory.CreateDbContextAsync(cancellationToken);
         var q = db.Whitelists.AsNoTracking().Where(x => x.Ip != null);
 
         if (!string.IsNullOrWhiteSpace(_wlIpSearch))
@@ -300,12 +302,12 @@
             q = q.Where(x => x.Ip!.Contains(s));
         }
 
-        var total = await q.CountAsync();
+        var total = await q.CountAsync(cancellationToken);
         var items = await q
             .OrderByDescending(x => x.CreatedUtc)
             .Skip(state.Page * state.PageSize)
             .Take(state.PageSize)
-            .ToListAsync();
+            .ToListAsync(cancellationToken);
 
         return new GridData<Whitelist> { Items = items, TotalItems = total };
     }
@@ -331,7 +333,7 @@
 
     private async Task RemoveWhitelistIp(string ip)
     {
-        var res = await Dialogs.ShowMessageBox("Confirm", $"Remove {ip} from whitelist?", yesText: "Remove", cancelText: "Cancel");
+        var res = await Dialogs.ShowMessageBoxAsync("Confirm", $"Remove {ip} from whitelist?", yesText: "Remove", cancelText: "Cancel");
         if (res == true)
         {
             var ok = await RateSvc.RemoveWhitelistIpAsync(ip);
@@ -347,9 +349,9 @@
     private string? _newWhitelistReasonPfx;
     private int? _newWhitelistExpireHoursPfx;
 
-    private async Task<GridData<Whitelist>> LoadWhitelistPrefixGridAsync(GridState<Whitelist> state)
+    private async Task<GridData<Whitelist>> LoadWhitelistPrefixGridAsync(GridState<Whitelist> state, CancellationToken cancellationToken)
     {
-        await using var db = await DbFactory.CreateDbContextAsync();
+        await using var db = await DbFactory.CreateDbContextAsync(cancellationToken);
         var q = db.Whitelists.AsNoTracking().Where(x => x.Ipv6Prefix != null);
 
         if (!string.IsNullOrWhiteSpace(_wlPfxSearch))
@@ -358,12 +360,12 @@
             q = q.Where(x => x.Ipv6Prefix!.Contains(s));
         }
 
-        var total = await q.CountAsync();
+        var total = await q.CountAsync(cancellationToken);
         var items = await q
             .OrderByDescending(x => x.CreatedUtc)
             .Skip(state.Page * state.PageSize)
             .Take(state.PageSize)
-            .ToListAsync();
+            .ToListAsync(cancellationToken);
 
         return new GridData<Whitelist> { Items = items, TotalItems = total };
     }
@@ -389,7 +391,7 @@
 
     private async Task RemoveWhitelistPrefix(string pfx)
     {
-        var res = await Dialogs.ShowMessageBox("Confirm", $"Remove {pfx} from whitelist?", yesText: "Remove", cancelText: "Cancel");
+        var res = await Dialogs.ShowMessageBoxAsync("Confirm", $"Remove {pfx} from whitelist?", yesText: "Remove", cancelText: "Cancel");
         if (res == true)
         {
             var ok = await RateSvc.RemoveWhitelistIpv6PrefixAsync(pfx);