Merge branch 'main' into codex/find-and-fix-a-critical-bug

Author: phmatray

Directory.Packages.props

@@ -6,13 +6,12 @@
   <!-- Framework-agnostic packages -->
   <ItemGroup>
     <!-- UI Framework packages -->
-    <PackageVersion Include="MudBlazor" Version="8.9.0" />
+    <PackageVersion Include="MudBlazor" Version="8.11.0" />
 
     <!-- Testing packages -->
     <PackageVersion Include="bunit" Version="1.40.0" />
     <PackageVersion Include="FakeItEasy" Version="8.3.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.v3" Version="3.0.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3">
       <PrivateAssets>all</PrivateAssets>
@@ -38,9 +37,9 @@
 
   <!-- .NET 8.0 packages -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.18" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.18" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.18" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.19" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.19" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.19" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
@@ -49,12 +48,12 @@
 
   <!-- .NET 9.0 packages -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.8" />
   </ItemGroup>
 </Project>

FormCraft/Forms/Extensions/ServiceCollectionExtensions.cs

@@ -36,13 +36,16 @@ public static IServiceCollection AddFormCraft(this IServiceCollection services)
 
         // Only register built-in field renderers if no UI framework adapter is registered
         // This allows UI framework-specific renderers to take precedence
-        services.AddScoped<IFieldRenderer, StringFieldRenderer>();
-        services.AddScoped<IFieldRenderer, IntFieldRenderer>();
-        services.AddScoped<IFieldRenderer, DecimalFieldRenderer>();
-        services.AddScoped<IFieldRenderer, DoubleFieldRenderer>();
-        services.AddScoped<IFieldRenderer, BoolFieldRenderer>();
-        services.AddScoped<IFieldRenderer, DateTimeFieldRenderer>();
-        services.AddScoped<IFieldRenderer, FileUploadFieldRenderer>();
+        if (services.All(s => s.ServiceType != typeof(IUIFrameworkAdapter)))
+        {
+            services.AddScoped<IFieldRenderer, StringFieldRenderer>();
+            services.AddScoped<IFieldRenderer, IntFieldRenderer>();
+            services.AddScoped<IFieldRenderer, DecimalFieldRenderer>();
+            services.AddScoped<IFieldRenderer, DoubleFieldRenderer>();
+            services.AddScoped<IFieldRenderer, BoolFieldRenderer>();
+            services.AddScoped<IFieldRenderer, DateTimeFieldRenderer>();
+            services.AddScoped<IFieldRenderer, FileUploadFieldRenderer>();
+        }
 
         // Register security services
         services.AddScoped<IEncryptionService, BlazorEncryptionService>();