FIX: scrutor default params → Pl.Shared.Web

Author: BaggerFast

Src/Apps/Desktop/Pl.Desktop.Api/App/Shared/Labels/Generate/Services/CacheService.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Localization;
 using Pl.Database;
 using Pl.Database.Entities.Zpl.Templates;
-using Pl.Desktop.Api.App.Shared.Labels.Generate.Utils;
+using Pl.Desktop.Api.App.Shared.Labels.Generate.Shared.Utils;
 using Pl.Desktop.Api.App.Shared.Labels.Localization;
 using Pl.Print.Features.Barcodes.Models;
 using Pl.Print.Features.Templates.Models;

Src/Apps/Desktop/Pl.Desktop.Api/App/Shared/Labels/Generate/Utils/BitMapUtils.cs Src/Apps/Desktop/Pl.Desktop.Api/App/Shared/Labels/Generate/Shared/Utils/BitMapUtils.cs

@@ -2,7 +2,7 @@
 using System.Drawing.Imaging;
 using Svg;
 
-namespace Pl.Desktop.Api.App.Shared.Labels.Generate.Utils;
+namespace Pl.Desktop.Api.App.Shared.Labels.Generate.Shared.Utils;
 
 public static class BitMapUtils
 {

Src/Apps/Desktop/Pl.Desktop.Client/Platforms/Windows/Package.appxmanifest

@@ -3,8 +3,9 @@
   <assemblyIdentity version="1.0.0.0" name="Pl.Desktop.Client.WinUI.app"/>
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+            PerMonitorV2, PerMonitor
+      </dpiAwareness>
     </windowsSettings>
   </application>
 </assembly>

Src/Apps/Desktop/Pl.Desktop.Client/Platforms/Windows/app.manifest

@@ -3,7 +3,6 @@
 
 namespace Pl.Admin.Api.App.Features.References1C.Brands;
 
-
 [ApiController]
 [Route(ApiEndpoints.Brands)]
 public sealed class BrandController(IBrandService brandService)

Src/Apps/Web/Pl.Admin.Api/App/Features/References1C/Brands/BrandController.cs

@@ -1,3 +1,3 @@
 namespace Pl.Admin.Api;
 
-internal interface IDeviceControlApiAssembly;
+internal interface IAdminApiAssembly;

Src/Apps/Web/Pl.Admin.Api/DeviceControlApiAssembly.cs

@@ -13,10 +13,10 @@
 builder.Services
     .BaseSetup()
     .AddUserClaims()
-    .AddHelpers<IDeviceControlApiAssembly>()
-    .AddValidators<IDeviceControlApiAssembly>()
-    .AddApiServices<IDeviceControlApiAssembly>()
-    .AddMiddlewares<IDeviceControlApiAssembly>()
+    .AddHelpers<IAdminApiAssembly>()
+    .AddValidators<IAdminApiAssembly>()
+    .AddApiServices<IAdminApiAssembly>()
+    .AddMiddlewares<IAdminApiAssembly>()
     .AddAuth(builder.Configuration);
 
 WebApplication app = builder.Build();

Src/Apps/Web/Pl.Admin.Api/Program.cs

@@ -7,7 +7,7 @@
         <Deterministic>true</Deterministic>
         <WarningLevel>9999</WarningLevel>
         <Prefer32Bit>false</Prefer32Bit>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
@@ -66,7 +66,7 @@
             Include="$(MSBuildThisFileDirectory)\Libs\Pl.Shared\Pl.Shared.csproj"
             Condition="'$(MSBuildProjectName)' != 'Pl.Shared'"
             PrivateAssets="All"
-            />
+        />
     </ItemGroup>
 
     <ItemGroup Label="BF">

Src/Directory.Build.props

@@ -40,7 +40,7 @@ public static IServiceCollection AddValidators<T>(this IServiceCollection servic
     {
         return services.Scan(scan => scan
             .FromAssembliesOf(typeof(T))
-            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("Validator")))
+            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("Validator")), false)
             .AsSelf()
             .WithScopedLifetime()
         );
@@ -50,7 +50,7 @@ public static IServiceCollection AddMiddlewares<T>(this IServiceCollection servi
     {
         return services.Scan(scan => scan
             .FromAssembliesOf(typeof(T))
-            .AddClasses(i => i.Where(type => type.Name.EndsWith("Middleware")))
+            .AddClasses(i => i.Where(type => type.Name.EndsWith("Middleware")), false)
             .AsSelf()
             .WithTransientLifetime()
         );
@@ -60,7 +60,7 @@ public static IServiceCollection AddApiServices<T>(this IServiceCollection servi
     {
         return services.Scan(scan => scan
             .FromAssembliesOf(typeof(T))
-            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("ApiService")))
+            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("ApiService")), false)
             .AsImplementedInterfaces()
             .WithScopedLifetime()
         );
@@ -70,7 +70,7 @@ public static IServiceCollection AddRefitEndpoints<T>(this IServiceCollection se
     {
         return services.Scan(scan => scan
             .FromAssembliesOf(typeof(T))
-            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("Endpoints")))
+            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("Endpoints")), false)
             .AsSelf()
             .WithScopedLifetime()
         );
@@ -80,7 +80,7 @@ public static IServiceCollection AddHelpers<T>(this IServiceCollection services)
     {
         return services.Scan(scan => scan
             .FromAssembliesOf(typeof(T))
-            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("Helper")))
+            .AddClasses(classes => classes.Where(type => type.Name.EndsWith("Helper")), false)
             .AsSelf()
             .WithTransientLifetime()
         );
@@ -90,7 +90,7 @@ public static IServiceCollection AddDelegatingHandlers<T>(this IServiceCollectio
     {
         return services.Scan(scan => scan
             .FromAssembliesOf(typeof(T))
-            .AddClasses(classes => classes.AssignableTo<DelegatingHandler>())
+            .AddClasses(classes => classes.AssignableTo<DelegatingHandler>(), false)
             .AsSelf()
             .WithTransientLifetime()
         );