UPDATE: packages versions, remove duplicated dependencies

Ap73MKa · Ap73MKa · commit 82242ee0b882 · 2024-07-18T10:18:41.000+03:00
FIX: disable class names validation in fluent ui components
diff --git a/Src/Apps/Desktop/ScalesDesktop/MauiProgram.cs b/Src/Apps/Desktop/ScalesDesktop/MauiProgram.cs
@@ -22,7 +22,7 @@ public static MauiAppBuilder CreateMauiApp()
         builder.Configuration.AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: false, reloadOnChange: true);
 
         builder.Services.AddMauiBlazorWebView();
-        builder.Services.AddFluentUIComponents();
+        builder.Services.AddFluentUIComponents(c => c.ValidateClassNames = false);
 
 #if DEBUG
         builder.Services.AddBlazorWebViewDeveloperTools();
diff --git a/Src/Apps/Desktop/ScalesDesktop/ScalesDesktop.csproj b/Src/Apps/Desktop/ScalesDesktop/ScalesDesktop.csproj
@@ -50,16 +50,16 @@
         <PackageReference Include="itext7.bouncy-castle-adapter" Version="8.0.4" />
         <PackageReference Include="MassaK.Plugin" Version="1.0.2" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
-        <PackageReference Include="Phetch.Blazor" Version="0.7.1" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
+        <PackageReference Include="Phetch.Blazor" Version="1.0.0" />
         <PackageReference Include="Refit.HttpClientFactory" Version="7.1.2" />
         <PackageReference Include="TscZebra.Plugin" Version="1.0.4" />
         <PackageReference Include="vNext.BlazorComponents.FluentValidation" Version="1.1.3" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.61" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.70" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Src/Apps/Mobile/ScalesMobile/MauiProgram.cs b/Src/Apps/Mobile/ScalesMobile/MauiProgram.cs
@@ -12,7 +12,7 @@ public static MauiApp CreateMauiApp()
 
         builder.UseMauiApp<App>();
         builder.Services.AddMauiBlazorWebView();
-        builder.Services.AddFluentUIComponents();
+        builder.Services.AddFluentUIComponents(c => c.ValidateClassNames = false);
         // builder.Services.AddDomainServices();
 
 #if DEBUG
diff --git a/Src/Apps/Mobile/ScalesMobile/ScalesMobile.csproj b/Src/Apps/Mobile/ScalesMobile/ScalesMobile.csproj
@@ -56,12 +56,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazor.Heroicons" Version="2.1.2.3" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
-        <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.7.1" />
-        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.61" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.70" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     </ItemGroup>
 
diff --git a/Src/Apps/Web/DeviceControl/DeviceControl.csproj b/Src/Apps/Web/DeviceControl/DeviceControl.csproj
@@ -14,8 +14,8 @@
         <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.5.3"/>
         <PackageReference Include="DeepCloner" Version="0.10.4"/>
         <PackageReference Include="FluentValidation" Version="11.9.2"/>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.6"/>
-        <PackageReference Include="Phetch.Blazor" Version="0.7.1"/>
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
+        <PackageReference Include="Phetch.Blazor" Version="1.0.0" />
         <PackageReference Include="Refit" Version="7.1.2"/>
         <PackageReference Include="Refit.HttpClientFactory" Version="7.1.2"/>
         <PackageReference Include="vNext.BlazorComponents.FluentValidation" Version="1.1.3"/>
diff --git a/Src/Apps/Web/DeviceControl/Program.cs b/Src/Apps/Web/DeviceControl/Program.cs
@@ -16,7 +16,7 @@
 
 builder.Services.AddRazorComponents().AddInteractiveServerComponents();
 builder.Services.AddBlazorise().AddEmptyProviders().AddFontAwesomeIcons();
-builder.Services.AddFluentUIComponents();
+builder.Services.AddFluentUIComponents(c => c.ValidateClassNames = false);
 builder.Services.ConfigureKeycloakAuthorization(builder.Configuration.GetSection("Oidc"), oidcScheme);
 
 builder.Services.AddLocalization();
diff --git a/Src/Infrastructure/Ws.Database.EntityFramework/Ws.Database.EntityFramework.csproj b/Src/Infrastructure/Ws.Database.EntityFramework/Ws.Database.EntityFramework.csproj
@@ -3,12 +3,12 @@
         <OutputType>Exe</OutputType>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/Src/Infrastructure/Ws.Database.Nhibernate/Ws.Database.Nhibernate.csproj b/Src/Infrastructure/Ws.Database.Nhibernate/Ws.Database.Nhibernate.csproj
@@ -2,11 +2,11 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="NHibernate" Version="5.5.1" />
+        <PackageReference Include="NHibernate" Version="5.5.2" />
         <PackageReference Include="ProjectionTools" Version="1.0.17" />
         <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     </ItemGroup>
diff --git a/Src/Libs/Ws.Components/Source/UI/Form/FieldLabel.razor b/Src/Libs/Ws.Components/Source/UI/Form/FieldLabel.razor
@@ -26,5 +26,5 @@ else
   [Parameter] public string Url { get; set; } = string.Empty;
   [Parameter] public string Class { get; set; } = string.Empty;
   [Parameter] public string HtmlFor { get; set; } = string.Empty;
-  [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object> AdditionalAttributes { get; set; } = new();
+  [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object>? AdditionalAttributes { get; set; } = new();
 }
diff --git a/Src/Libs/Ws.Components/Ws.Components.csproj b/Src/Libs/Ws.Components/Ws.Components.csproj
@@ -9,9 +9,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazor.Heroicons" Version="2.1.2.3" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.6" />
-        <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.7.1" />
+        <PackageReference Include="Blazor.Heroicons" Version="2.1.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
+        <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Src/Libs/Ws.Components/wwwroot/app.css b/Src/Libs/Ws.Components/wwwroot/app.css
@@ -112,4 +112,8 @@
   .fluent-tooltip-provider fluent-tooltip::part(tooltip) {
     @apply !bg-background !text-popover-foreground !border-border !px-3 !py-1.5 !shadow-md after:hidden
   }
+
+  .fluent-datepicker-popup {
+    @apply !shadow-md !border
+  }
 }
diff --git a/Src/Tests/Ws.Components.Tests/Ws.Components.Tests.csproj b/Src/Tests/Ws.Components.Tests/Ws.Components.Tests.csproj
@@ -4,14 +4,10 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="bunit" Version="1.28.9" />
+    <PackageReference Include="bunit" Version="1.29.5" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Src/Tests/Ws.Domain.Models.Tests/Ws.Domain.Models.Tests.csproj b/Src/Tests/Ws.Domain.Models.Tests/Ws.Domain.Models.Tests.csproj
@@ -9,11 +9,7 @@
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="xunit" Version="2.8.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/Src/Tests/Ws.Labels.Tests/Ws.Labels.Tests.csproj b/Src/Tests/Ws.Labels.Tests/Ws.Labels.Tests.csproj
@@ -8,11 +8,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="xunit" Version="2.8.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/Src/Tests/Ws.Shared.Tests/Ws.Shared.Tests.csproj b/Src/Tests/Ws.Shared.Tests/Ws.Shared.Tests.csproj
@@ -8,11 +8,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="xunit" Version="2.8.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ else`
`26`	`26`	`[Parameter] public string Url { get; set; } = string.Empty;`
`27`	`27`	`[Parameter] public string Class { get; set; } = string.Empty;`
`28`	`28`	`[Parameter] public string HtmlFor { get; set; } = string.Empty;`
`29`		`- [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object> AdditionalAttributes { get; set; } = new();`
	`29`	`+ [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object>? AdditionalAttributes { get; set; } = new();`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,4 +112,8 @@`
`112`	`112`	`.fluent-tooltip-provider fluent-tooltip::part(tooltip) {`
`113`	`113`	`@apply !bg-background !text-popover-foreground !border-border !px-3 !py-1.5 !shadow-md after:hidden`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ .fluent-datepicker-popup {`
	`117`	`+ @apply !shadow-md !border`
	`118`	`+ }`
`115`	`119`	`}`