From 703dfec817efbec081c766980778de88541c73ed Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 4 Sep 2024 08:28:35 +0200
Subject: [PATCH] TAb3: - update NLog - update nuget vari

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

diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index a28e2509..8a695a6d 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2406.508</Version>
+      <Version>6.16.2409.408</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
@@ -25,9 +25,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EgwCoreLib.Razor" Version="1.4.2402.2311" />
-    <PackageReference Include="EgwCoreLib.Utils" Version="1.4.2402.2311" />
-    <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
+    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2408.2710" />
+    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2408.2710" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
+    <PackageReference Include="NLog" Version="5.3.3" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.12" />
+    <PackageReference Include="StackExchange.Redis" Version="2.8.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP-TAB3/NLog.config b/MP-TAB3/NLog.config
deleted file mode 100644
index 10411f3f..00000000
--- a/MP-TAB3/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="Info" writeTo="consoleTarget" />-->
-        <logger name="*" minlevel="Trace" writeTo="consoleTarget" />
-        <logger name="*" minlevel="Info" writeTo="fileTarget" />
-    </rules>
-</nlog>
\ No newline at end of file
diff --git a/MP-TAB3/Program.cs b/MP-TAB3/Program.cs
index 11cb304a..96d5bc17 100644
--- a/MP-TAB3/Program.cs
+++ b/MP-TAB3/Program.cs
@@ -6,14 +6,21 @@ using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.FileProviders;
 using MP.Data;
 using MP.Data.Services;
+using NLog;
+using NLog.Web;
 using StackExchange.Redis;
 using static Org.BouncyCastle.Math.EC.ECCurve;
 
 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");
 var cString = configuration.GetConnectionString("Redis");
 string connStringRedis = cString ?? "localhost:6379, DefaultDatabase=5, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false";
 //string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
@@ -44,6 +51,7 @@ builder.Services.AddScoped<MailService>();
 
 builder.Services.AddHttpContextAccessor();
 
+logger.Info("Aggiunti services");
 
 var app = builder.Build();
 
@@ -79,9 +87,12 @@ if (!string.IsNullOrEmpty(BasePathDisegni))
     }
 }
 
+logger.Info("Add disegni path");
+
 app.UseRouting();
 
 app.MapBlazorHub();
 app.MapFallbackToPage("/_Host");
 
+logger.Info("Run App");
 app.Run();
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index bf02e83c..5f90d708 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2406.508</h4>
+    <h4>Versione: 6.16.2409.408</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 27d57623..9fd70b9c 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2406.508
+6.16.2409.408
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index d2856c26..a7db1dc0 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2406.508</version>
+  <version>6.16.2409.408</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json
index 5db9c2a2..09876947 100644
--- a/MP-TAB3/appsettings.json
+++ b/MP-TAB3/appsettings.json
@@ -15,6 +15,49 @@
     "MP.Tab": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;",
     "MP.Mag": "Server=SQL2016DEV;Database=MoonPro_MAG; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.TAB3;"
   },
+  "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"
+      }
+    ]
+  },
   "OptConf": {
     "msRefresh": "1100",
     "CodModulo": "MP-TAB3",