Merge branch 'develop' of https://gitlab.steamware.net/etis/lux into develop

This commit is contained in:
Annamaria Sassi
2026-05-19 09:12:34 +02:00
3 changed files with 15 additions and 13 deletions
+1
View File
@@ -12,6 +12,7 @@
<PackageVersion Include="DevExpress.Blazor" Version="25.2.5" />
<PackageVersion Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.5" />
<PackageVersion Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.5" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.23" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.3.0" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.5" />
<PackageVersion Include="Egw.Lux.WebWindow.Base" Version="3.1.5.1509" />
+1
View File
@@ -65,6 +65,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
<PackageReference Include="NLog" />
<PackageReference Include="NLog.Targets.OpenTelemetryProtocol" />
<PackageReference Include="NLog.Web.AspNetCore" />
+13 -13
View File
@@ -4,7 +4,7 @@ using NLog.Targets;
using NLog.Web;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using System.Text.Json.Serialization;
//using System.Text.Json.Serialization;
var builder = WebApplication.CreateBuilder(args);
// recupero env corrente
@@ -156,19 +156,19 @@ builder.Services.AddDbContextFactory<ReportContext>(options =>
.LogTo(_ => { }); // disabilita EF logging;
});
// fix serializazzione senza loop
builder.Services.AddControllers().AddJsonOptions(options =>
{
options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
});
//// fix serializazzione senza loop
//builder.Services.AddControllers().AddJsonOptions(options =>
//{
// options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
//});
//// fix serializzazione con NewtonsoftJson e gestione loop...
//builder.Services
// .AddControllers()
// .AddNewtonsoftJson(options =>
// {
// options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
// });
// fix serializzazione con NewtonsoftJson e gestione loop...
builder.Services
.AddControllers()
.AddNewtonsoftJson(options =>
{
options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
});
// registrazione in blocco servizi con metodo extension custom