From b90603fda7a4fbb88fe9a7e86ec97e1f35543f7f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 4 Sep 2024 07:32:45 +0200 Subject: [PATCH] Update SPEC + nuget: - fix compare invariant x azienda - EFCore - EgwCoreLibs - Blazored storage - NLog cons etup json - Rimozione caching Redis (old) - Mailkit --- MP.Data/Controllers/MpSpecController.cs | 2 +- MP.Data/MP.Data.csproj | 14 ++++---- MP.SPEC/MP.SPEC.csproj | 9 ++--- MP.SPEC/NLog.config | 46 ------------------------- MP.SPEC/Program.cs | 18 ++++++++++ MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- MP.SPEC/appsettings.json | 43 +++++++++++++++++++++++ 9 files changed, 77 insertions(+), 61 deletions(-) delete mode 100644 MP.SPEC/NLog.config diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index c5a2f7fd..9ba39d77 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -207,7 +207,7 @@ namespace MP.Data.Controllers dbResult = dbCtx .DbSetArticoli .AsNoTracking() - .Where(x => (azienda == "*" || x.Azienda.Equals(azienda, StringComparison.InvariantCultureIgnoreCase)) && (string.IsNullOrEmpty(searchVal) || x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal))) + .Where(x => (azienda == "*" || x.Azienda.ToLower().Equals(azienda.ToLower())) && (string.IsNullOrEmpty(searchVal) || x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal))) .OrderBy(x => x.CodArticolo) .Take(numRecord) .ToList(); diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 93a7fb20..18ebdfc5 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -18,15 +18,15 @@ - + - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -34,6 +34,6 @@ - + \ No newline at end of file diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 55df5528..8f432bf4 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2404.3016 + 6.16.2409.407 1800a78a-6ff1-40f9-b490-87fb8bfc1394 @@ -38,12 +38,13 @@ - + - - + + + diff --git a/MP.SPEC/NLog.config b/MP.SPEC/NLog.config deleted file mode 100644 index 3e4185f4..00000000 --- a/MP.SPEC/NLog.config +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP.SPEC/Program.cs b/MP.SPEC/Program.cs index a8e143df..af583595 100644 --- a/MP.SPEC/Program.cs +++ b/MP.SPEC/Program.cs @@ -6,6 +6,8 @@ using Microsoft.AspNetCore.Components.Web; using MP.SPEC.Components; using MP.SPEC.Data; using MP.SPEC.Services; +using NLog; +using NLog.Web; using StackExchange.Redis; var builder = WebApplication.CreateBuilder(args); @@ -18,15 +20,26 @@ var builder = WebApplication.CreateBuilder(args); * * */ + +var logger = LogManager.Setup() + .LoadConfigurationFromAppSettings() + .GetCurrentClassLogger(); +logger.Info("Program.cs: startup"); + ConfigurationManager configuration = builder.Configuration; + // REDIS setup +logger.Info("Setup REDIS"); string connStringRedis = configuration.GetConnectionString("Redis"); //string connStringRedis = configuration.GetConnectionString("RedisAdmin"); string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":")); // avvio oggetto shared x redis... var redisMultiplexer = ConnectionMultiplexer.Connect(connStringRedis); + + // Add services to the container. +logger.Info("Setup Auth"); builder.Services.AddAuthentication(NegotiateDefaults.AuthenticationScheme) .AddNegotiate(); @@ -47,7 +60,10 @@ builder.Services.AddBlazoredSessionStorage(); builder.Services.AddHttpClient(); builder.Services.AddSingleton(); +logger.Info("Aggiunti services"); + var app = builder.Build(); +logger.Info("Build App"); // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) @@ -75,4 +91,6 @@ app.UseEndpoints(endpoints => //app.MapBlazorHub(); //app.MapFallbackToPage("/_Host"); +logger.Info("Run App"); + app.Run(); diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index e18988bd..f69bd808 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2404.3016

+

Versione: 6.16.2409.407


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 2ac7ed17..6d551475 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2404.3016 +6.16.2409.407 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 55ccba52..eb62f5bf 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2404.3016 + 6.16.2409.407 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/appsettings.json b/MP.SPEC/appsettings.json index 45897fa7..9e519fb5 100644 --- a/MP.SPEC/appsettings.json +++ b/MP.SPEC/appsettings.json @@ -5,6 +5,49 @@ "Microsoft.AspNetCore": "Warning" } }, + "NLog": { + "variables": { + "baseFileDir": "${basedir}/logs/", + "layout": "${longdate} | ${uppercase:${level}} | ${logger:shortName=false} | ${message}" + }, + // "internalLogLevel": "Info", + // "internalLogFile": "c:\\temp\\internal-nlog.txt", + "extensions": [ + { "assembly": "NLog.Extensions.Logging" }, + { "assembly": "NLog.Web.AspNetCore" } + ], + "throwConfigExceptions": true, + "targets": { + "async": true, + "logfile": { + "type": "File", + "fileName": "${basedir}/logs/${shortdate}.log", + "archiveEvery": "Day", + "archiveFileName": "${basedir}/logs/old/${shortdate}_{#}.log", + "archiveNumbering": "DateAndSequence", + "archiveAboveSize": "1024000", + "archiveDateFormat": "HH", + "maxArchiveFiles": "60", + "maxArchiveDays": "30" + }, + "logconsole": { + "type": "ColoredConsole", + "layout": "${longdate} | ${uppercase:${level}} | ${logger:shortName=true} | ${message}" + } + }, + "rules": [ + { + "logger": "*", + "minLevel": "Trace", + "writeTo": "logconsole" + }, + { + "logger": "*", + "minLevel": "Info", + "writeTo": "logfile" + } + ] + }, "AllowedHosts": "*", "CodApp": "MP.SPEC", "ConnectionStrings": {