From b982ed20e398b3528de92b32ea302f222edf44e0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 4 Sep 2024 08:55:17 +0200
Subject: [PATCH] MP-INVE: - update NLog - update nuget vari

---
 MP.INVE/Data/MiDataService.cs    |  1 +
 MP.INVE/MP.INVE.csproj           | 11 +++++---
 MP.INVE/NLog.config              | 46 --------------------------------
 MP.INVE/Program.cs               | 12 +++++++++
 MP.INVE/Resources/ChangeLog.html |  2 +-
 MP.INVE/Resources/VersNum.txt    |  2 +-
 MP.INVE/Resources/manifest.xml   |  2 +-
 MP.INVE/appsettings.json         | 43 +++++++++++++++++++++++++++++
 8 files changed, 66 insertions(+), 53 deletions(-)
 delete mode 100644 MP.INVE/NLog.config

diff --git a/MP.INVE/Data/MiDataService.cs b/MP.INVE/Data/MiDataService.cs
index 09b5488e..d4b71a40 100644
--- a/MP.INVE/Data/MiDataService.cs
+++ b/MP.INVE/Data/MiDataService.cs
@@ -6,6 +6,7 @@ using StackExchange.Redis;
 using System.Diagnostics;
 using EgwCoreLib.Razor;
 using EgwCoreLib.Razor.Data;
+using EgwCoreLib.Utils;
 
 namespace MP.INVE.Data
 {
diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj
index 13ee92b2..60f976f6 100644
--- a/MP.INVE/MP.INVE.csproj
+++ b/MP.INVE/MP.INVE.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.INVE</RootNamespace>
-    <Version>6.16.2402.1914</Version>
+    <Version>6.16.2409.408</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,11 +21,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
+    <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.3.2302.507" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.9" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2408.2710" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.12" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP.INVE/NLog.config b/MP.INVE/NLog.config
deleted file mode 100644
index b32ba10a..00000000
--- a/MP.INVE/NLog.config
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
-      autoReload="true"
-      throwExceptions="false"
-      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
-
-    <!-- optional, add some variables
-  https://github.com/nlog/NLog/wiki/Configuration-file#variables
-  -->
-    <variable name="myvar" value="myvalue" />
-
-    <!--
-  See https://github.com/nlog/nlog/wiki/Configuration-file
-  for information on customizing logging rules and outputs.
-   -->
-    <targets>
-
-        <!--
-    add your targets here
-    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
-    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-    -->
-
-        <!--
-    Write events to a file with the date in the filename.
-    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
-            layout="${longdate} ${uppercase:${level}} ${message}" />
-    -->
-        <target xsi:type="File" name="fileTarget" fileName="${basedir}/logs/${shortdate}.log" layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=false} | ${message}" />
-        <target xsi:type="ColoredConsole" name="consoleTarget"  layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=true} | ${message}" />
-    </targets>
-
-    <rules>
-        <!-- add your logging rules here -->
-
-        <!--
-    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
-    <logger name="*" minlevel="Debug" writeTo="f" />
-    -->
-        <logger name="*" minlevel="Trace" writeTo="consoleTarget" />
-        <!--<logger name="Microsoft.*" maxlevel="Info" final="true" />-->
-        <logger name="*" minlevel="Info" writeTo="fileTarget" />
-    </rules>
-</nlog>
\ No newline at end of file
diff --git a/MP.INVE/Program.cs b/MP.INVE/Program.cs
index 76d25e2a..e6c81e3f 100644
--- a/MP.INVE/Program.cs
+++ b/MP.INVE/Program.cs
@@ -6,6 +6,8 @@ using Microsoft.AspNetCore.Components.Web;
 using MP.INVE.Components;
 using MP.INVE.Data;
 using MP.INVE.Services;
+using NLog;
+using NLog.Web;
 using StackExchange.Redis;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -18,9 +20,16 @@ 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 redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
 // avvio oggetto shared x redis...
@@ -41,6 +50,8 @@ builder.Services.AddBlazoredLocalStorage();
 builder.Services.AddHttpClient();
 builder.Services.AddSingleton<IOApiService>();
 
+logger.Info("Aggiunti services");
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -60,4 +71,5 @@ app.UseRouting();
 app.MapBlazorHub();
 app.MapFallbackToPage("/_Host");
 
+logger.Info("Run App");
 app.Run();
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html
index 133369ca..b166755d 100644
--- a/MP.INVE/Resources/ChangeLog.html
+++ b/MP.INVE/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOINVE </i>
-    <h4>Versione: 6.16.2402.1914</h4>
+    <h4>Versione: 6.16.2409.408</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt
index a4449e2e..9fd70b9c 100644
--- a/MP.INVE/Resources/VersNum.txt
+++ b/MP.INVE/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.1914
+6.16.2409.408
diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml
index 7d28b553..9866626f 100644
--- a/MP.INVE/Resources/manifest.xml
+++ b/MP.INVE/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.1914</version>
+  <version>6.16.2409.408</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.INVE/appsettings.json b/MP.INVE/appsettings.json
index 7511901f..0caf0371 100644
--- a/MP.INVE/appsettings.json
+++ b/MP.INVE/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.INVE",
   "ConnectionStrings": {