update package, fix template service bug

pwelter34 · pwelter34 · commit 89654089bbc2 · 2025-10-19T19:41:38.000-05:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,50 +5,49 @@
     <NoWarn>$(NoWarn);NU1507</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.2" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.1" />
     <PackageVersion Include="AspNetCore.SecurityKey" Version="3.0.0" />
     <PackageVersion Include="AssemblyMetadata.Generators" Version="2.1.0" />
     <PackageVersion Include="AutoMapper" Version="[14.0.0]" />
-    <PackageVersion Include="AwesomeAssertions" Version="9.2.0" />
+    <PackageVersion Include="AwesomeAssertions" Version="9.2.1" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.1.0" />
     <PackageVersion Include="Azure.Communication.Sms" Version="1.0.2" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
-    <PackageVersion Include="Blazored.FluentValidation" Version="2.2.0" />
-    <PackageVersion Include="Blazored.Modal" Version="7.3.1" />
-    <PackageVersion Include="Bogus" Version="35.6.3" />
+    <PackageVersion Include="Blazilla" Version="1.1.0" />
+    <PackageVersion Include="Bogus" Version="35.6.4" />
     <PackageVersion Include="CsvHelper" Version="33.1.0" />
     <PackageVersion Include="dbup-sqlserver" Version="6.0.0" />
     <PackageVersion Include="Equatable.Generator" Version="2.0.0" />
     <PackageVersion Include="FluentValidation" Version="12.0.0" />
     <PackageVersion Include="Fluid.Core" Version="2.25.0" />
-    <PackageVersion Include="Injectio" Version="5.0.0" />
-    <PackageVersion Include="LoreSoft.Blazor.Controls" Version="11.6.1" />
-    <PackageVersion Include="MailKit" Version="4.13.0" />
+    <PackageVersion Include="Injectio" Version="5.1.0" />
+    <PackageVersion Include="LoreSoft.Blazor.Controls" Version="12.2.1" />
+    <PackageVersion Include="MailKit" Version="4.14.1" />
     <PackageVersion Include="MediatR" Version="[12.5.0]" />
-    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.221" />
+    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.227" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.10" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.10" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.10" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.10.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1" />
-    <PackageVersion Include="Microsoft.Identity.Web" Version="3.14.1" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
-    <PackageVersion Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.0.36421.1" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="4.0.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.0.36525.3" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="MongoDB.Abstracts" Version="6.6.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
@@ -61,19 +60,19 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.11.0-beta.2" />
     <PackageVersion Include="Riok.Mapperly" Version="4.2.1" />
     <PackageVersion Include="Rocks" Version="9.3.0" />
-    <PackageVersion Include="Scalar.AspNetCore" Version="2.8.6" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.9.0" />
     <PackageVersion Include="SendGrid.Extensions.DependencyInjection" Version="1.0.1" />
     <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageVersion Include="starkbank-ecdsa" Version="1.3.3" />
-    <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.7" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.9" />
+    <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.9" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <PackageVersion Include="SystemTextJsonPatch" Version="4.2.0" />
     <PackageVersion Include="TestHost.Abstracts" Version="1.2.0" />
-    <PackageVersion Include="Testcontainers.MongoDb" Version="4.7.0" />
-    <PackageVersion Include="Testcontainers.MsSql" Version="4.7.0" />
-    <PackageVersion Include="TUnit" Version="0.61.39" />
-    <PackageVersion Include="Twilio" Version="7.13.2" />
-    <PackageVersion Include="Verify.TUnit" Version="30.19.0" />
+    <PackageVersion Include="Testcontainers.MongoDb" Version="4.8.0" />
+    <PackageVersion Include="Testcontainers.MsSql" Version="4.8.0" />
+    <PackageVersion Include="TUnit" Version="0.73.19" />
+    <PackageVersion Include="Twilio" Version="7.13.4" />
+    <PackageVersion Include="Verify.TUnit" Version="31.0.2" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/EntityFramework/src/Tracker.Client/Components/Abstracts/EditPageBase.cs b/samples/EntityFramework/src/Tracker.Client/Components/Abstracts/EditPageBase.cs
@@ -1,9 +1,9 @@
 using Arbiter.CommandQuery.Definitions;
 using Arbiter.CommandQuery.Extensions;
 
-using Microsoft.AspNetCore.Components.Forms;
+using LoreSoft.Blazor.Controls;
 
-using Tracker.Client.Extensions;
+using Microsoft.AspNetCore.Components.Forms;
 
 
 namespace Tracker.Client.Components.Abstracts;
@@ -82,7 +82,7 @@ protected virtual async Task HandleDelete()
             if (IsCreate || Store.Model == null)
                 return;
 
-            if (!await Modal.ConfirmDelete($"Are you sure you want to delete {ModelTypeName} '{ModelInstanceName}'?"))
+            if (!await Modal.ConfirmDelete($"{ModelTypeName} '{ModelInstanceName}'"))
                 return;
 
             await Store.Delete();
diff --git a/samples/EntityFramework/src/Tracker.Client/Components/Abstracts/ListPageBase.cs b/samples/EntityFramework/src/Tracker.Client/Components/Abstracts/ListPageBase.cs
@@ -1,8 +1,6 @@
 using Arbiter.CommandQuery.Definitions;
 using Arbiter.CommandQuery.Queries;
 
-using Blazored.Modal.Services;
-
 using LoreSoft.Blazor.Controls;
 
 using Microsoft.AspNetCore.Components;
@@ -26,8 +24,8 @@ protected ListPageBase()
         SearchText = new DebounceValue<string>(HandleSearch);
     }
 
-    [CascadingParameter]
-    public required IModalService Modal { get; set; }
+    [Inject]
+    public required ModalService Modal { get; set; }
 
     [Inject]
     public required DataService DataService { get; set; }
diff --git a/samples/EntityFramework/src/Tracker.Client/Components/Abstracts/StorePageBase.cs b/samples/EntityFramework/src/Tracker.Client/Components/Abstracts/StorePageBase.cs
@@ -1,7 +1,7 @@
 using Arbiter.CommandQuery.Definitions;
 using Arbiter.CommandQuery.State;
 
-using Blazored.Modal.Services;
+using LoreSoft.Blazor.Controls;
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
@@ -14,8 +14,8 @@ public abstract class StorePageBase<TReadModel, TUpdateModel> : PrincipalBase, I
     where TReadModel : class, IHaveIdentifier<int>, new()
     where TUpdateModel : class, new()
 {
-    [CascadingParameter]
-    public required IModalService Modal { get; set; }
+    [Inject]
+    public required ModalService Modal { get; set; }
 
     [Inject]
     public required ModelStateEditor<int, TReadModel, TUpdateModel> Store { get; set; }
diff --git a/samples/EntityFramework/src/Tracker.Client/Components/ConfirmModal.razor b/samples/EntityFramework/src/Tracker.Client/Components/ConfirmModal.razor
diff --git a/samples/EntityFramework/src/Tracker.Client/Extensions/ModalExtensions.cs b/samples/EntityFramework/src/Tracker.Client/Extensions/ModalExtensions.cs
diff --git a/samples/EntityFramework/src/Tracker.Client/Pages/Priorities/Edit.razor b/samples/EntityFramework/src/Tracker.Client/Pages/Priorities/Edit.razor
@@ -22,7 +22,7 @@
 <div class="container">
     <LoadingBlock IsLoading="EditContext == null || Store.Model == null">
         <EditForm EditContext="EditContext" OnValidSubmit="HandleSave">
-            <FluentValidationValidator />
+            <FluentValidator />
 
             <div class="card shadow mb-5">
                 <div class="card-header">
diff --git a/samples/EntityFramework/src/Tracker.Client/Pages/Statuses/Edit.razor b/samples/EntityFramework/src/Tracker.Client/Pages/Statuses/Edit.razor
@@ -22,7 +22,7 @@
 <div class="container">
     <LoadingBlock IsLoading="EditContext == null || Store.Model == null">
         <EditForm EditContext="EditContext" OnValidSubmit="HandleSave">
-            <FluentValidationValidator />
+            <FluentValidator />
 
             <div class="card shadow mb-5">
                 <div class="card-header">
diff --git a/samples/EntityFramework/src/Tracker.Client/Pages/Tasks/Edit.razor b/samples/EntityFramework/src/Tracker.Client/Pages/Tasks/Edit.razor
@@ -22,7 +22,7 @@
 <div class="container">
     <LoadingBlock IsLoading="EditContext == null || Store.Model == null">
         <EditForm EditContext="EditContext" OnValidSubmit="HandleSave">
-            <FluentValidationValidator />
+            <FluentValidator />
 
             <div class="card shadow mb-5">
                 <div class="card-header">
diff --git a/samples/EntityFramework/src/Tracker.Client/Pages/Tenants/Edit.razor b/samples/EntityFramework/src/Tracker.Client/Pages/Tenants/Edit.razor
@@ -22,7 +22,7 @@
 <div class="container">
     <LoadingBlock IsLoading="EditContext == null || Store.Model == null">
         <EditForm EditContext="EditContext" OnValidSubmit="HandleSave">
-            <FluentValidationValidator />
+            <FluentValidator />
 
             <div class="card shadow mb-5">
                 <div class="card-header">
diff --git a/samples/EntityFramework/src/Tracker.Client/Pages/Users/Edit.razor b/samples/EntityFramework/src/Tracker.Client/Pages/Users/Edit.razor
@@ -22,7 +22,7 @@
 <div class="container">
     <LoadingBlock IsLoading="EditContext == null || Store.Model == null">
         <EditForm EditContext="EditContext" OnValidSubmit="HandleSave">
-            <FluentValidationValidator />
+            <FluentValidator />
 
             <div class="card shadow mb-5">
                 <div class="card-header">
diff --git a/samples/EntityFramework/src/Tracker.Client/Routes.razor b/samples/EntityFramework/src/Tracker.Client/Routes.razor
@@ -1,19 +1,17 @@
-@using Blazored.Modal
+<ModalContainer />
 
-<CascadingBlazoredModal Position="ModalPosition.TopCenter" Size="ModalSize.Large" OverlayCustomClass="blazored-modal-overlay">
-    <Router AppAssembly="@typeof(Program).Assembly">
-        <Found Context="routeData">
-            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
-                <NotAuthorized>
-                    <Signin />
-                </NotAuthorized>
-            </AuthorizeRouteView>
-            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-        </Found>
-        <NotFound>
-            <LayoutView Layout="@typeof(MainLayout)">
-                <NotFound />
-            </LayoutView>
-        </NotFound>
-    </Router>
-</CascadingBlazoredModal>
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
+            <NotAuthorized>
+                <Signin />
+            </NotAuthorized>
+        </AuthorizeRouteView>
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <NotFound />
+        </LayoutView>
+    </NotFound>
+</Router>
diff --git a/samples/EntityFramework/src/Tracker.Client/Services/ServiceRegistration.cs b/samples/EntityFramework/src/Tracker.Client/Services/ServiceRegistration.cs
@@ -1,9 +1,6 @@
 using System.Text.Json;
 
 using Arbiter.CommandQuery;
-using Arbiter.CommandQuery.Dispatcher;
-
-using Blazored.Modal;
 
 using LoreSoft.Blazor.Controls;
 
@@ -20,9 +17,6 @@ public static class ServiceRegistration
     public static void Register(IServiceCollection services, ISet<string> tags)
     {
         // component libraries
-        services
-            .AddBlazoredModal();
-
         services
             .AddBlazorControls();
 
diff --git a/samples/EntityFramework/src/Tracker.Client/Tracker.Client.csproj b/samples/EntityFramework/src/Tracker.Client/Tracker.Client.csproj
@@ -9,8 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazored.FluentValidation" />
-    <PackageReference Include="Blazored.Modal" />
+    <PackageReference Include="Blazilla" />
     <PackageReference Include="LoreSoft.Blazor.Controls" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" />
diff --git a/samples/EntityFramework/src/Tracker.Client/_Imports.razor b/samples/EntityFramework/src/Tracker.Client/_Imports.razor
@@ -11,7 +11,7 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 
-@using Blazored.FluentValidation
+@using Blazilla
 
 @using Tracker.Client
 @using Tracker.Client.Components
diff --git a/samples/EntityFramework/src/Tracker.Web/Components/_Imports.razor b/samples/EntityFramework/src/Tracker.Web/Components/_Imports.razor
@@ -11,7 +11,7 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 
-@using Blazored.FluentValidation
+@using Blazilla
 
 @using Tracker.Client
 @using Tracker.Client.Layout
diff --git a/src/Arbiter.Communication/Template/TemplateService.cs b/src/Arbiter.Communication/Template/TemplateService.cs
@@ -54,6 +54,7 @@ public string ApplyTemplate<TModel>(string? source, TModel model)
             return source ?? string.Empty;
 
         var options = new TemplateOptions();
+        options.CultureInfo = System.Globalization.CultureInfo.CurrentUICulture;
         options.MemberAccessStrategy = new UnsafeMemberAccessStrategy();
 
         var context = new TemplateContext(model, options, allowModelMembers: true);
