From 39609693a8a1fe4a05bd76bb46dfe5387f48bc61 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 25 Sep 2024 11:55:17 +0200
Subject: [PATCH] Aggiunte altre info pagina hw (predisposto x includere
 liberire classi base x gestione)

---
 MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj  |   2 +-
 MP.MONO.ANALYZER/Resources/ChangeLog.html |   2 +-
 MP.MONO.ANALYZER/Resources/VersNum.txt    |   2 +-
 MP.MONO.ANALYZER/Resources/manifest.xml   |   2 +-
 MP.MONO.Core/MachineDataValidator.cs      |   2 +
 MP.MONO.Core/MachineInfo.cs               | 379 ++++++++++++----------
 MP.MONO.DECODER/MP.MONO.DECODER.csproj    |   2 +-
 MP.MONO.DECODER/Resources/ChangeLog.html  |   2 +-
 MP.MONO.DECODER/Resources/VersNum.txt     |   2 +-
 MP.MONO.DECODER/Resources/manifest.xml    |   2 +-
 MP.MONO.SIM/MP.MONO.SIM.csproj            |   2 +-
 MP.MONO.SIM/Resources/ChangeLog.html      |   2 +-
 MP.MONO.SIM/Resources/VersNum.txt         |   2 +-
 MP.MONO.SIM/Resources/manifest.xml        |   2 +-
 MP.MONO.UI/MP.MONO.UI.csproj              |   2 +-
 MP.MONO.UI/Pages/Info.razor               |  10 +-
 MP.MONO.UI/Pages/Info.razor.cs            |   6 +-
 MP.MONO.UI/Resources/ChangeLog.html       |   2 +-
 MP.MONO.UI/Resources/VersNum.txt          |   2 +-
 MP.MONO.UI/Resources/manifest.xml         |   2 +-
 MP.MONO.UI/appsettings.json               |   3 +-
 MP.MONO.UI/temp/InfoData.json             |  66 ++--
 22 files changed, 269 insertions(+), 229 deletions(-)
diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 9d62a38..ff0baf8 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2404.1519</Version>
+    <Version>1.2.2409.2509</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 6929e7c..caf4e14 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2404.1519</h4>
+    <h4>Version: 1.2.2409.2509</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 6c01f24..5a55326 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2404.1519
+1.2.2409.2509
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index a4cd2fc..31ed9a3 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2404.1519</version>
+  <version>1.2.2409.2509</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.Core/MachineDataValidator.cs b/MP.MONO.Core/MachineDataValidator.cs
index 998d782..535a880 100644
--- a/MP.MONO.Core/MachineDataValidator.cs
+++ b/MP.MONO.Core/MachineDataValidator.cs
@@ -164,6 +164,7 @@ namespace MP.MONO.Core
         public static Dictionary<string, string> netInfo = new Dictionary<string, string>();
         public static Dictionary<string, string> osInfo = new Dictionary<string, string>();
         public static Dictionary<string, string> ramInfo = new Dictionary<string, string>();
+        public static Dictionary<string, string> volInfo = new Dictionary<string, string>();
 
         /// <summary>
         /// Predispone elenco dati di test
@@ -178,6 +179,7 @@ namespace MP.MONO.Core
             netInfo = await MachineInfo.GetInfo("NET");
             osInfo = await MachineInfo.GetInfo("OS");
             ramInfo = await MachineInfo.GetInfo("RAM");
+            volInfo = await MachineInfo.GetInfo("VOL");
             testData = biosInfo.Concat(cpuInfo).Concat(netInfo).Concat(osInfo).Concat(ramInfo).GroupBy(ele => ele.Key).ToDictionary(ele => ele.Key, ele => ele.First().Value);
             return testData;
         }
diff --git a/MP.MONO.Core/MachineInfo.cs b/MP.MONO.Core/MachineInfo.cs
index cb925e9..025dccf 100644
--- a/MP.MONO.Core/MachineInfo.cs
+++ b/MP.MONO.Core/MachineInfo.cs
@@ -40,6 +40,10 @@ namespace MP.MONO.Core
                     outInfo = await GetRamInfo();
                     break;
 
+                case "VOL":
+                    outInfo = await GetVolumeInfo();
+                    break;
+
                 default:
                     break;
             }
@@ -56,8 +60,6 @@ namespace MP.MONO.Core
 
         #region Private Methods
 
-
-
         /// <summary>
         /// Info BIOS
         /// </summary>
@@ -65,7 +67,7 @@ namespace MP.MONO.Core
         private static async Task<Dictionary<string, string>> GetBiosInfo()
         {
             ManagementObjectCollection moc;
-            var Processor = new Dictionary<string, string>();
+            Dictionary<string, string> DictParam = new Dictionary<string, string>();
 
             try
             {
@@ -74,25 +76,213 @@ namespace MP.MONO.Core
             catch
             {
                 Log.Error("Error: WMI API Not loaded.");
-                return Processor;
+                return DictParam;
             }
 
             foreach (ManagementObject obj in moc)
             {
-                searchWmiParam(Processor, obj, "Manufacturer", "Manufacturer");
-                searchWmiParam(Processor, obj, "ReleaseDate", "ReleaseDate");
-                searchWmiParam(Processor, obj, "SMBIOSBIOSVersion", "SMBIOSBIOSVersion");
-                searchWmiParam(Processor, obj, "SMBIOSMajorVersion", "SMBIOSMajorVersion");
-                searchWmiParam(Processor, obj, "SMBIOSMinorVersion", "SMBIOSMinorVersion");
-                searchWmiParam(Processor, obj, "SoftwareElementID", "SoftwareElementID");
-                searchWmiParam(Processor, obj, "SoftwareElementState", "SoftwareElementState");
-                searchWmiParam(Processor, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion");
-                searchWmiParam(Processor, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion");
-                searchWmiParam(Processor, obj, "SystemBiosMinorVersion", "SystemBiosMinorVersion");
-                searchWmiParam(Processor, obj, "BiosVersion", "Version");
+                searchWmiParam(DictParam, obj, "Manufacturer", "Manufacturer");
+                searchWmiParam(DictParam, obj, "ReleaseDate", "ReleaseDate");
+                searchWmiParam(DictParam, obj, "SMBIOSBIOSVersion", "SMBIOSBIOSVersion");
+                searchWmiParam(DictParam, obj, "SMBIOSMajorVersion", "SMBIOSMajorVersion");
+                searchWmiParam(DictParam, obj, "SMBIOSMinorVersion", "SMBIOSMinorVersion");
+                searchWmiParam(DictParam, obj, "SoftwareElementID", "SoftwareElementID");
+                searchWmiParam(DictParam, obj, "SoftwareElementState", "SoftwareElementState");
+                searchWmiParam(DictParam, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion");
+                searchWmiParam(DictParam, obj, "SystemBiosMajorVersion", "SystemBiosMajorVersion");
+                searchWmiParam(DictParam, obj, "SystemBiosMinorVersion", "SystemBiosMinorVersion");
+                searchWmiParam(DictParam, obj, "BiosVersion", "Version");
             }
             await Task.Delay(1);
-            return Processor;
+            return DictParam;
+        }
+
+        /// <summary>
+        /// Info processore
+        /// </summary>
+        /// <returns></returns>
+        private static async Task<Dictionary<string, string>> GetCpuInfo()
+        {
+            ManagementObjectCollection moc;
+            Dictionary<string, string> DictParam = new Dictionary<string, string>();
+
+            try
+            {
+                moc = new ManagementObjectSearcher("select * from Win32_Processor").Get();
+            }
+            catch
+            {
+                Log.Error("Error: WMI API Not loaded.");
+                return DictParam;
+            }
+
+            foreach (ManagementObject obj in moc)
+            {
+                searchWmiParam(DictParam, obj, "AddressWidth", "AddressWidth");
+                searchWmiParam(DictParam, obj, "Architecture", "Architecture");
+                searchWmiParam(DictParam, obj, "CurrentClockSpeed", "CurrentClockSpeed");
+                searchWmiParam(DictParam, obj, "CurrentVoltage", "CurrentVoltage");
+                searchWmiParam(DictParam, obj, "DataWidth", "DataWidth");
+                searchWmiParam(DictParam, obj, "Description", "Description");
+                searchWmiParam(DictParam, obj, "ExtClock", "ExtClock");
+                searchWmiParam(DictParam, obj, "Family", "Family");
+                searchWmiParam(DictParam, obj, "L2CacheSize", "L2CacheSize");
+                searchWmiParam(DictParam, obj, "L3CacheSize", "L3CacheSize");
+                searchWmiParam(DictParam, obj, "Level", "Level");
+                searchWmiParam(DictParam, obj, "LoadPercentage", "LoadPercentage");
+                searchWmiParam(DictParam, obj, "Manufacturer", "Manufacturer");
+                searchWmiParam(DictParam, obj, "NumberOfCores", "NumberOfCores");
+                searchWmiParam(DictParam, obj, "NumberOfLogicalProcessors", "NumberOfLogicalProcessors");
+                searchWmiParam(DictParam, obj, "ProcessorId", "ProcessorId");
+                searchWmiParam(DictParam, obj, "ProcessorType", "ProcessorType");
+                searchWmiParam(DictParam, obj, "Revision", "Revision");
+                searchWmiParam(DictParam, obj, "Role", "Role");
+                searchWmiParam(DictParam, obj, "SocketDesignation", "SocketDesignation");
+                searchWmiParam(DictParam, obj, "SystemName", "SystemName");
+                searchWmiParam(DictParam, obj, "CpuVersion", "Version");
+            }
+            await Task.Delay(1);
+            return DictParam;
+        }
+
+        /// <summary>
+        /// Info Networking
+        /// </summary>
+        /// <returns></returns>
+        private static async Task<Dictionary<string, string>> GetNetInfo()
+        {
+            ManagementObjectCollection moc;
+            Dictionary<string, string> DictParam = new Dictionary<string, string>();
+
+            try
+            {
+                moc = new ManagementObjectSearcher("select * from Win32_NetworkAdapter WHERE NetEnabled = 'true'").Get();
+            }
+            catch
+            {
+                Log.Error("Error: WMI API Not loaded.");
+                return DictParam;
+            }
+
+            foreach (ManagementObject obj in moc)
+            {
+                searchWmiParam(DictParam, obj, "AdapterType", "AdapterType");
+                searchWmiParam(DictParam, obj, "Description", "Description");
+                searchWmiParam(DictParam, obj, "GUID", "GUID");
+                searchWmiParam(DictParam, obj, "MACAddress", "MACAddress");
+                searchWmiParam(DictParam, obj, "Manufacturer", "Manufacturer");
+                searchWmiParam(DictParam, obj, "Name", "Name");
+                searchWmiParam(DictParam, obj, "SystemName", "SystemName");
+                searchWmiParam(DictParam, obj, "PhysicalAdapter", "PhysicalAdapter");
+                searchWmiParam(DictParam, obj, "ProductName", "ProductName");
+                searchWmiParam(DictParam, obj, "ServiceName", "ServiceName");
+            }
+            await Task.Delay(1);
+            return DictParam;
+        }
+
+        /// <summary>
+        /// Info OS
+        /// </summary>
+        /// <returns></returns>
+        private static async Task<Dictionary<string, string>> GetOsInfo()
+        {
+            ManagementObjectCollection moc;
+            Dictionary<string, string> DictParam = new Dictionary<string, string>();
+
+            try
+            {
+                moc = new ManagementObjectSearcher("select * from Win32_OperatingSystem").Get();
+            }
+            catch
+            {
+                Log.Error("Error: WMI API Not loaded.");
+                return DictParam;
+            }
+
+            foreach (ManagementObject obj in moc)
+            {
+                searchWmiParam(DictParam, obj, "Caption", "Caption");
+                searchWmiParam(DictParam, obj, "Version", "Version");
+                searchWmiParam(DictParam, obj, "MaxNumberOfProcesses", "MaxNumberOfProcesses");
+                searchWmiParam(DictParam, obj, "MaxProcessMemorySize", "MaxProcessMemorySize");
+                searchWmiParam(DictParam, obj, "OSArchitecture", "OSArchitecture");
+                searchWmiParam(DictParam, obj, "SerialNumber", "SerialNumber");
+                searchWmiParam(DictParam, obj, "BuildNumber", "BuildNumber");
+                searchWmiParam(DictParam, obj, "RegisteredUser", "RegisteredUser");
+            }
+            await Task.Delay(1);
+            return DictParam;
+        }
+
+        /// <summary>
+        /// Info RAM
+        /// </summary>
+        /// <returns></returns>
+        private static async Task<Dictionary<string, string>> GetRamInfo()
+        {
+            ManagementObjectCollection moc;
+            Dictionary<string, string> DictParam = new Dictionary<string, string>();
+
+            try
+            {
+                moc = new ManagementObjectSearcher("select * from Win32_PhysicalMemory").Get();
+            }
+            catch
+            {
+                Log.Error("Error: WMI API Not loaded.");
+                return DictParam;
+            }
+
+            foreach (ManagementObject obj in moc)
+            {
+                searchWmiParam(DictParam, obj, "DeviceLocator", "DeviceLocator");
+                searchWmiParam(DictParam, obj, "DataWidth", "DataWidth");
+                searchWmiParam(DictParam, obj, "ConfiguredVoltage", "ConfiguredVoltage");
+                searchWmiParam(DictParam, obj, "FormFactor", "FormFactor");
+                searchWmiParam(DictParam, obj, "ConfiguredClockSpeed", "ConfiguredClockSpeed");
+                searchWmiParam(DictParam, obj, "MaxVoltage", "MaxVoltage");
+                searchWmiParam(DictParam, obj, "MinVoltage", "MinVoltage");
+                searchWmiParam(DictParam, obj, "Speed", "Speed");
+                searchWmiParam(DictParam, obj, "SMBIOSMemoryType", "SMBIOSMemoryType");
+                searchWmiParam(DictParam, obj, "PartNumber", "PartNumber");
+            }
+            await Task.Delay(1);
+            return DictParam;
+        }
+
+        /// <summary>
+        /// Info Volumes (HDD/SSD)
+        /// </summary>
+        /// <returns></returns>
+        private static async Task<Dictionary<string, string>> GetVolumeInfo()
+        {
+            ManagementObjectCollection moc;
+            Dictionary<string, string> DictParam = new Dictionary<string, string>();
+
+            try
+            {
+                moc = new ManagementObjectSearcher("select DriveLetter, DeviceID from Win32_Volume").Get();
+            }
+            catch
+            {
+                Log.Error("Error: WMI API Not loaded.");
+                return DictParam;
+            }
+
+            foreach (ManagementObject obj in moc)
+            {
+                // mi limito al disco "C:"
+                string sDrive = "DriveLetter";
+                var objVal = $"{obj[sDrive]}";
+                if (objVal == "C:")
+                {
+                    searchWmiParam(DictParam, obj, "DeviceID", "DeviceID");
+                    searchWmiParam(DictParam, obj, "DriveLetter", "DriveLetter");
+                }
+            }
+            await Task.Delay(1);
+            return DictParam;
         }
 
         /// <summary>
@@ -114,163 +304,6 @@ namespace MP.MONO.Core
             { }
         }
 
-        /// <summary>
-        /// Info processore
-        /// </summary>
-        /// <returns></returns>
-        private static async Task<Dictionary<string, string>> GetCpuInfo()
-        {
-            ManagementObjectCollection moc;
-            var Processor = new Dictionary<string, string>();
-
-            try
-            {
-                moc = new ManagementObjectSearcher("select * from Win32_Processor").Get();
-            }
-            catch
-            {
-                Log.Error("Error: WMI API Not loaded.");
-                return Processor;
-            }
-
-            foreach (ManagementObject obj in moc)
-            {
-                searchWmiParam(Processor, obj, "AddressWidth", "AddressWidth");
-                searchWmiParam(Processor, obj, "Architecture", "Architecture");
-                searchWmiParam(Processor, obj, "CurrentClockSpeed", "CurrentClockSpeed");
-                searchWmiParam(Processor, obj, "CurrentVoltage", "CurrentVoltage");
-                searchWmiParam(Processor, obj, "DataWidth", "DataWidth");
-                searchWmiParam(Processor, obj, "Description", "Description");
-                searchWmiParam(Processor, obj, "ExtClock", "ExtClock");
-                searchWmiParam(Processor, obj, "Family", "Family");
-                searchWmiParam(Processor, obj, "L2CacheSize", "L2CacheSize");
-                searchWmiParam(Processor, obj, "L3CacheSize", "L3CacheSize");
-                searchWmiParam(Processor, obj, "Level", "Level");
-                searchWmiParam(Processor, obj, "LoadPercentage", "LoadPercentage");
-                searchWmiParam(Processor, obj, "Manufacturer", "Manufacturer");
-                searchWmiParam(Processor, obj, "NumberOfCores", "NumberOfCores");
-                searchWmiParam(Processor, obj, "NumberOfLogicalProcessors", "NumberOfLogicalProcessors");
-                searchWmiParam(Processor, obj, "ProcessorId", "ProcessorId");
-                searchWmiParam(Processor, obj, "ProcessorType", "ProcessorType");
-                searchWmiParam(Processor, obj, "Revision", "Revision");
-                searchWmiParam(Processor, obj, "Role", "Role");
-                searchWmiParam(Processor, obj, "SocketDesignation", "SocketDesignation");
-                searchWmiParam(Processor, obj, "SystemName", "SystemName");
-                searchWmiParam(Processor, obj, "CpuVersion", "Version");
-
-            }
-            await Task.Delay(1);
-            return Processor;
-        }
-
-        /// <summary>
-        /// Info Networking
-        /// </summary>
-        /// <returns></returns>
-        private static async Task<Dictionary<string, string>> GetNetInfo()
-        {
-            ManagementObjectCollection moc;
-            var Processor = new Dictionary<string, string>();
-
-            try
-            {
-                moc = new ManagementObjectSearcher("select * from Win32_NetworkAdapter WHERE NetEnabled = 'true'").Get();
-            }
-            catch
-            {
-                Log.Error("Error: WMI API Not loaded.");
-                return Processor;
-            }
-
-            foreach (ManagementObject obj in moc)
-            {
-                searchWmiParam(Processor, obj, "AdapterType", "AdapterType");
-                searchWmiParam(Processor, obj, "Description", "Description");
-                searchWmiParam(Processor, obj, "GUID", "GUID");
-                searchWmiParam(Processor, obj, "MACAddress", "MACAddress");
-                searchWmiParam(Processor, obj, "Manufacturer", "Manufacturer");
-                searchWmiParam(Processor, obj, "Name", "Name");
-                searchWmiParam(Processor, obj, "SystemName", "SystemName");
-                searchWmiParam(Processor, obj, "PhysicalAdapter", "PhysicalAdapter");
-                searchWmiParam(Processor, obj, "ProductName", "ProductName");
-                searchWmiParam(Processor, obj, "ServiceName", "ServiceName");
-
-            }
-            await Task.Delay(1);
-            return Processor;
-        }
-
-        /// <summary>
-        /// Info OS
-        /// </summary>
-        /// <returns></returns>
-        private static async Task<Dictionary<string, string>> GetOsInfo()
-        {
-            ManagementObjectCollection moc;
-            var Processor = new Dictionary<string, string>();
-
-            try
-            {
-                moc = new ManagementObjectSearcher("select * from Win32_OperatingSystem").Get();
-            }
-            catch
-            {
-                Log.Error("Error: WMI API Not loaded.");
-                return Processor;
-            }
-
-            foreach (ManagementObject obj in moc)
-            {
-                searchWmiParam(Processor, obj, "Caption", "Caption");
-                searchWmiParam(Processor, obj, "Version", "Version");
-                searchWmiParam(Processor, obj, "MaxNumberOfProcesses", "MaxNumberOfProcesses");
-                searchWmiParam(Processor, obj, "MaxProcessMemorySize", "MaxProcessMemorySize");
-                searchWmiParam(Processor, obj, "OSArchitecture", "OSArchitecture");
-                searchWmiParam(Processor, obj, "SerialNumber", "SerialNumber");
-                searchWmiParam(Processor, obj, "BuildNumber", "BuildNumber");
-
-            }
-            await Task.Delay(1);
-            return Processor;
-        }
-
-        /// <summary>
-        /// Info RAM
-        /// </summary>
-        /// <returns></returns>
-        private static async Task<Dictionary<string, string>> GetRamInfo()
-        {
-            ManagementObjectCollection moc;
-            var Processor = new Dictionary<string, string>();
-
-            try
-            {
-                moc = new ManagementObjectSearcher("select * from Win32_PhysicalMemory").Get();
-            }
-            catch
-            {
-                Log.Error("Error: WMI API Not loaded.");
-                return Processor;
-            }
-
-            foreach (ManagementObject obj in moc)
-            {
-                searchWmiParam(Processor, obj, "DeviceLocator", "DeviceLocator");
-                searchWmiParam(Processor, obj, "DataWidth", "DataWidth");
-                searchWmiParam(Processor, obj, "ConfiguredVoltage", "ConfiguredVoltage");
-                searchWmiParam(Processor, obj, "FormFactor", "FormFactor");
-                searchWmiParam(Processor, obj, "ConfiguredClockSpeed", "ConfiguredClockSpeed");
-                searchWmiParam(Processor, obj, "MaxVoltage", "MaxVoltage");
-                searchWmiParam(Processor, obj, "MinVoltage", "MinVoltage");
-                searchWmiParam(Processor, obj, "Speed", "Speed");
-                searchWmiParam(Processor, obj, "SMBIOSMemoryType", "SMBIOSMemoryType");
-                searchWmiParam(Processor, obj, "PartNumber", "PartNumber");
-
-            }
-            await Task.Delay(1);
-            return Processor;
-        }
-
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 201f3e3..4eb97dd 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2404.1519</Version>
+    <Version>1.2.2409.2509</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 6929e7c..caf4e14 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2404.1519</h4>
+    <h4>Version: 1.2.2409.2509</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 6c01f24..5a55326 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2404.1519
+1.2.2409.2509
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index e31631b..ca64bb2 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2404.1519</version>
+  <version>1.2.2409.2509</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index d17817d..a452561 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2404.1519</Version>
+    <Version>1.2.2409.2509</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index 6929e7c..caf4e14 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2404.1519</h4>
+    <h4>Version: 1.2.2409.2509</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 6c01f24..5a55326 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2404.1519
+1.2.2409.2509
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index ccf95a5..5d8f2d4 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2404.1519</version>
+  <version>1.2.2409.2509</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 88b20c2..461050f 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2404.1519</Version>
+    <Version>1.2.2409.2510</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.UI/Pages/Info.razor b/MP.MONO.UI/Pages/Info.razor
index 82c6667..2a29332 100644
--- a/MP.MONO.UI/Pages/Info.razor
+++ b/MP.MONO.UI/Pages/Info.razor
@@ -48,24 +48,24 @@
                 <div>
                     <DisplayInfo ParamName="CPU Info" currInfo="@cpuInfo" btnType="btn-primary" showSection="@showCpu"></DisplayInfo>
                 </div>
-
-                
             </div>
             <div class="col-4">
                 <div>
                     <DisplayInfo ParamName="NET Info" currInfo="@netInfo" btnType="btn-primary" showSection="@showNet"></DisplayInfo>
                 </div>
-
                 <div class="pt-1">
                     <DisplayInfo ParamName="OS Info" currInfo="@osInfo" btnType="btn-primary mb-1" showSection="@showOs"></DisplayInfo>
                 </div>
+                <div class="pt-1">
+                    <DisplayInfo ParamName="VOLUME Info" currInfo="@volInfo" btnType="btn-primary mb-1" showSection="@showVol"></DisplayInfo>
+                </div>
             </div>
             <div class="col-4">
                 <div>
-                    <DisplayInfo ParamName="BIOS Info" currInfo="@biosInfo" btnType="btn-primary" showSection="@showBios"></DisplayInfo>
+                    <DisplayInfo ParamName="RAM Info" currInfo="@ramInfo" btnType="btn-primary mb-1" showSection="@showRam"></DisplayInfo>
                 </div>
                 <div class="pt-1">
-                    <DisplayInfo ParamName="RAM Info" currInfo="@ramInfo" btnType="btn-primary mb-1" showSection="@showRam"></DisplayInfo>
+                    <DisplayInfo ParamName="BIOS Info" currInfo="@biosInfo" btnType="btn-primary" showSection="@showBios"></DisplayInfo>
                 </div>
             </div>
         </div>
diff --git a/MP.MONO.UI/Pages/Info.razor.cs b/MP.MONO.UI/Pages/Info.razor.cs
index cac4be4..4feb5c7 100644
--- a/MP.MONO.UI/Pages/Info.razor.cs
+++ b/MP.MONO.UI/Pages/Info.razor.cs
@@ -38,6 +38,7 @@ namespace MP.MONO.UI.Pages
             netInfo = MachineDataValidator.netInfo;
             osInfo = MachineDataValidator.osInfo;
             ramInfo = MachineDataValidator.ramInfo;
+            volInfo = MachineDataValidator.volInfo;
             // check licenze
             licOk = await MachineDataValidator.testCurrInfo();
         }
@@ -53,13 +54,15 @@ namespace MP.MONO.UI.Pages
         private Dictionary<string, string> netInfo = new Dictionary<string, string>();
         private Dictionary<string, string> osInfo = new Dictionary<string, string>();
         private Dictionary<string, string> ramInfo = new Dictionary<string, string>();
+        private Dictionary<string, string> volInfo = new Dictionary<string, string>();
         private bool showBios = false;
         private bool showCpu = false;
         private bool showKeyMan = false;
         private bool showNet = false;
         private bool showOs = false;
         private bool showRam = false;
-
+        private bool showVol = false;
+        
         #endregion Private Fields
 
         #region Private Properties
@@ -105,6 +108,7 @@ namespace MP.MONO.UI.Pages
             showNet = true;
             showOs = true;
             showRam = true;
+            showVol = true;
         }
 
         private void ToggleKeyMan()
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 6929e7c..b246141 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2404.1519</h4>
+    <h4>Version: 1.2.2409.2510</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 6c01f24..5346691 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2404.1519
+1.2.2409.2510
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 75457bb..c409d2b 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2404.1519</version>
+  <version>1.2.2409.2510</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.MONO.UI/appsettings.json b/MP.MONO.UI/appsettings.json
index c7ae969..6b094fc 100644
--- a/MP.MONO.UI/appsettings.json
+++ b/MP.MONO.UI/appsettings.json
@@ -14,7 +14,8 @@
     "MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
   },
   "DbConfig": {
-    "Server": "10.74.82.230",
+    "Server": "mdb.ufficio",
+    //"Server": "10.74.82.230",
     "nKey": "MONO",
     "sKey": "Calcium0xide-CaO"
   },
diff --git a/MP.MONO.UI/temp/InfoData.json b/MP.MONO.UI/temp/InfoData.json
index 976d3c8..3f101dd 100644
--- a/MP.MONO.UI/temp/InfoData.json
+++ b/MP.MONO.UI/temp/InfoData.json
@@ -2,55 +2,55 @@
   "AdapterType": "Ethernet 802.3",
   "AddressWidth": "64",
   "Architecture": "9",
-  "BiosVersion": "_ASUS_ - 1072009",
-  "BuildNumber": "19045",
-  "Caption": "Microsoft Windows 10 Pro",
-  "ConfiguredClockSpeed": "2400",
+  "BiosVersion": "ALASKA - 1072009",
+  "BuildNumber": "22631",
+  "Caption": "Microsoft Windows 11 Pro N",
+  "ConfiguredClockSpeed": "3600",
   "ConfiguredVoltage": "1200",
   "CpuVersion": "Modello 1, Stepping 0",
-  "CurrentClockSpeed": "2200",
-  "CurrentVoltage": "12",
+  "CurrentClockSpeed": "3501",
+  "CurrentVoltage": "11",
   "DataWidth": "64",
-  "Description": "AMD64 Family 23 Model 17 Stepping 0",
-  "DeviceLocator": "ChannelA-DIMM0",
+  "Description": "AMD64 Family 23 Model 113 Stepping 0",
+  "DeviceLocator": "DIMM 1",
   "ExtClock": "100",
   "Family": "107",
-  "FormFactor": "12",
-  "GUID": "{7F313732-DBA3-46E5-9FA7-BEF235B0682E}",
-  "L2CacheSize": "2048",
-  "L3CacheSize": "4096",
+  "FormFactor": "8",
+  "GUID": "{E76995C4-F180-406E-B9C3-E491C65A8FCF}",
+  "L2CacheSize": "8192",
+  "L3CacheSize": "65536",
   "Level": "23",
-  "LoadPercentage": "43",
-  "MACAddress": "4C:ED:FB:D9:78:83",
-  "Manufacturer": "American Megatrends Inc.",
+  "LoadPercentage": "9",
+  "MACAddress": "0C:9D:92:B8:FD:E8",
+  "Manufacturer": "American Megatrends International, LLC.",
   "MaxNumberOfProcesses": "4294967295",
   "MaxProcessMemorySize": "137438953344",
   "MaxVoltage": "1200",
   "MinVoltage": "1200",
-  "Name": "Realtek PCIe GbE Family Controller",
-  "NumberOfCores": "4",
-  "NumberOfLogicalProcessors": "8",
+  "Name": "ASUS XG-C100C 10G PCI-E Network Adapter",
+  "NumberOfCores": "16",
+  "NumberOfLogicalProcessors": "32",
   "OSArchitecture": "64 bit",
-  "PartNumber": "8ATF1G64HZ-2G3E1    ",
+  "PartNumber": "CMK64GX4M2D3600C18",
   "PhysicalAdapter": "True",
-  "ProcessorId": "178BFBFF00810F10",
+  "ProcessorId": "178BFBFF00870F10",
   "ProcessorType": "3",
-  "ProductName": "Realtek PCIe GbE Family Controller",
-  "ReleaseDate": "20190521000000.000000+000",
-  "Revision": "4352",
+  "ProductName": "ASUS XG-C100C 10G PCI-E Network Adapter",
+  "ReleaseDate": "20210521000000.000000+000",
+  "Revision": "28928",
   "Role": "CPU",
-  "SerialNumber": "00330-80951-85780-AA242",
-  "ServiceName": "rt640x64",
-  "SMBIOSBIOSVersion": "X505ZA.311",
+  "SerialNumber": "00332-00330-00000-AA008",
+  "ServiceName": "aqnic650",
+  "SMBIOSBIOSVersion": "F33",
   "SMBIOSMajorVersion": "3",
   "SMBIOSMemoryType": "26",
-  "SMBIOSMinorVersion": "1",
-  "SocketDesignation": "FP5",
-  "SoftwareElementID": "X505ZA.311",
+  "SMBIOSMinorVersion": "3",
+  "SocketDesignation": "AM4",
+  "SoftwareElementID": "F33",
   "SoftwareElementState": "3",
-  "Speed": "2400",
+  "Speed": "3600",
   "SystemBiosMajorVersion": "5",
-  "SystemBiosMinorVersion": "13",
-  "SystemName": "EGALW-NB-004",
-  "Version": "10.0.19045"
+  "SystemBiosMinorVersion": "17",
+  "SystemName": "WRKST-R9-SAM",
+  "Version": "10.0.22631"
 }
\ No newline at end of file
