Merge pull request #46 from PandaTechAM/development

HaikAsatryan · web-flow · commit efb402ece07d · 2025-04-11T19:55:31.000+04:00
nuget updates
diff --git a/Shared.Kernel.Demo/Shared.Kernel.Demo.csproj b/Shared.Kernel.Demo/Shared.Kernel.Demo.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/SharedKernel/OpenApi/OpenApiExtensions.cs b/src/SharedKernel/OpenApi/OpenApiExtensions.cs
@@ -55,7 +55,7 @@ public static WebApplication UseOpenApi(this WebApplication app)
       app.MapOpenApi();
       app.MapSwaggerUiAssetEndpoint();
       app.MapSwaggerUi(openApiConfiguration);
-      app.MapScalarUi();
+      app.MapScalarUi(openApiConfiguration);
       return app;
    }
 
diff --git a/src/SharedKernel/OpenApi/UiExtensions.cs b/src/SharedKernel/OpenApi/UiExtensions.cs
@@ -34,13 +34,21 @@ internal static WebApplication MapSwaggerUi(this WebApplication app, OpenApiConf
       return app;
    }
 
-   internal static WebApplication MapScalarUi(this WebApplication app)
+   internal static WebApplication MapScalarUi(this WebApplication app, OpenApiConfig openApiConfigConfiguration)
    {
       app.MapScalarApiReference(options =>
       {
          options.Theme = ScalarTheme.Kepler;
-
          options.Favicon = "/swagger-resources/favicon.svg";
+         
+         foreach (var document in openApiConfigConfiguration.Documents)
+         {
+            options.AddDocument(
+               document.GroupName,
+               document.Title,
+               document.GetEndpointUrl()
+            );
+         }
       });
       return app;
    }
diff --git a/src/SharedKernel/SharedKernel.csproj b/src/SharedKernel/SharedKernel.csproj
@@ -33,32 +33,32 @@
         <PackageReference Include="FluentDateTime" Version="3.0.0" />
         <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
         <PackageReference Include="HtmlSanitizer" Version="9.0.876" />
-        <PackageReference Include="MediatR" Version="12.4.1" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.3" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.3" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.3" />
+        <PackageReference Include="MediatR" Version="12.5.0" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.4" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.4" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.4" />
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
+        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
         <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
         <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
         <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
         <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
-        <PackageReference Include="Pandatech.Crypto" Version="4.1.2" />
+        <PackageReference Include="Pandatech.Crypto" Version="5.0.0" />
         <PackageReference Include="Pandatech.DistributedCache" Version="4.0.7" />
         <PackageReference Include="PandaTech.FileExporter" Version="4.0.2" />
         <PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="2.0.2" />
         <PackageReference Include="Pandatech.PandaVaultClient" Version="4.0.4" />
         <PackageReference Include="Pandatech.RegexBox" Version="3.0.1" />
         <PackageReference Include="Pandatech.ResponseCrafter" Version="5.1.9" />
-        <PackageReference Include="Scalar.AspNetCore" Version="2.0.34" />
+        <PackageReference Include="Scalar.AspNetCore" Version="2.1.11" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
         <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.3.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/SharedKernel/ValidatorAndMediatR/Behaviors/ValidationBehaviorWithResponse.cs b/src/SharedKernel/ValidatorAndMediatR/Behaviors/ValidationBehaviorWithResponse.cs
@@ -14,7 +14,7 @@ public async Task<TResponse> Handle(TRequest request,
    {
       if (!validators.Any())
       {
-         return await next();
+         return await next(cancellationToken);
       }
 
       var context = new ValidationContext<TRequest>(request);
@@ -26,7 +26,7 @@ public async Task<TResponse> Handle(TRequest request,
 
       if (failures.Count == 0)
       {
-         return await next();
+         return await next(cancellationToken);
       }
 
       var errors = failures.GroupBy(e => e.PropertyName, e => e.ErrorMessage)
diff --git a/src/SharedKernel/ValidatorAndMediatR/Behaviors/ValidationBehaviorWithoutResponse.cs b/src/SharedKernel/ValidatorAndMediatR/Behaviors/ValidationBehaviorWithoutResponse.cs
@@ -14,7 +14,7 @@ public async Task<TResponse> Handle(TRequest request,
    {
       if (!validators.Any())
       {
-         return await next();
+         return await next(cancellationToken);
       }
 
       var context = new ValidationContext<TRequest>(request);
@@ -26,7 +26,7 @@ public async Task<TResponse> Handle(TRequest request,
 
       if (failures.Count == 0)
       {
-         return await next();
+         return await next(cancellationToken);
       }
 
       var errors = failures.GroupBy(e => e.PropertyName, e => e.ErrorMessage)

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static WebApplication UseOpenApi(this WebApplication app)`
`55`	`55`	`app.MapOpenApi();`
`56`	`56`	`app.MapSwaggerUiAssetEndpoint();`
`57`	`57`	`app.MapSwaggerUi(openApiConfiguration);`
`58`		`- app.MapScalarUi();`
	`58`	`+ app.MapScalarUi(openApiConfiguration);`
`59`	`59`	`return app;`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,21 @@ internal static WebApplication MapSwaggerUi(this WebApplication app, OpenApiConf`
`34`	`34`	`return app;`
`35`	`35`	`}`
`36`	`36`
`37`		`- internal static WebApplication MapScalarUi(this WebApplication app)`
	`37`	`+ internal static WebApplication MapScalarUi(this WebApplication app, OpenApiConfig openApiConfigConfiguration)`
`38`	`38`	`{`
`39`	`39`	`app.MapScalarApiReference(options =>`
`40`	`40`	`{`
`41`	`41`	`options.Theme = ScalarTheme.Kepler;`
`42`		`-`
`43`	`42`	`options.Favicon = "/swagger-resources/favicon.svg";`
	`43`	`+`
	`44`	`+ foreach (var document in openApiConfigConfiguration.Documents)`
	`45`	`+ {`
	`46`	`+ options.AddDocument(`
	`47`	`+ document.GroupName,`
	`48`	`+ document.Title,`
	`49`	`+ document.GetEndpointUrl()`
	`50`	`+ );`
	`51`	`+ }`
`44`	`52`	`});`
`45`	`53`	`return app;`
`46`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public async Task<TResponse> Handle(TRequest request,`
`14`	`14`	`{`
`15`	`15`	`if (!validators.Any())`
`16`	`16`	`{`
`17`		`- return await next();`
	`17`	`+ return await next(cancellationToken);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`var context = new ValidationContext<TRequest>(request);`
`@@ -26,7 +26,7 @@ public async Task<TResponse> Handle(TRequest request,`
`26`	`26`
`27`	`27`	`if (failures.Count == 0)`
`28`	`28`	`{`
`29`		`- return await next();`
	`29`	`+ return await next(cancellationToken);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`var errors = failures.GroupBy(e => e.PropertyName, e => e.ErrorMessage)`