Update to latest version from upstream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,7 +9,7 @@ assignees: ''
 
 ### Library version
 
-### OS & OS version
+### OS, version, architecture (32 bit / 64 bit)
 
 ### Describe the bug
 <!-- 

Hardware.Info.Benchmark/Hardware.Info.Benchmark.csproj

@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
   </ItemGroup>
 
   <ItemGroup>

Hardware.Info.Benchmark/Program.cs

@@ -16,6 +16,8 @@ public class Benchmarks
         [Benchmark]
         public void RefreshBIOSList() => _hardwareInfo.RefreshBIOSList();
         [Benchmark]
+        public void RefreshComputerSystemList() => _hardwareInfo.RefreshComputerSystemList();
+        [Benchmark]
         public void RefreshCPUList() => _hardwareInfo.RefreshCPUList();
         [Benchmark]
         public void RefreshDriveList() => _hardwareInfo.RefreshDriveList();

Hardware.Info.Test/Edid.cs

@@ -103,26 +103,29 @@ static void EDID()
 
     static void Monitor()
     {
-        string resolution = null;
-        string refreshRate = null;
-        string edidFile = null;
+        string? resolution = null;
+        string? refreshRate = null;
+        string? edidFile = null;
 
         // Get the display resolution and refresh rate using xrandr
-        var xrandrProcess = Process.Start(new ProcessStartInfo
+        Process? xrandrProcess = Process.Start(new ProcessStartInfo
         {
             FileName = "xrandr",
             RedirectStandardOutput = true,
             UseShellExecute = false
         });
 
+        if (xrandrProcess == null)
+            return;
+
         while (!xrandrProcess.StandardOutput.EndOfStream)
         {
-            string line = xrandrProcess.StandardOutput.ReadLine();
+            string? line = xrandrProcess.StandardOutput.ReadLine();
 
-            if (line.Contains("*"))
+            if (line?.Contains('*') == true)
             {
-                resolution = line.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries)[0];
-                refreshRate = line.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries)[1];
+                resolution = line.Split(" ", StringSplitOptions.RemoveEmptyEntries)[0];
+                refreshRate = line.Split(" ", StringSplitOptions.RemoveEmptyEntries)[1];
                 break;
             }
         }
@@ -131,12 +134,12 @@ static void Monitor()
         Console.WriteLine($"Monitor refreshRate: {refreshRate}");
 
         // Look up the EDID file based on the display configuration
-        var drmDirectory = new DirectoryInfo("/sys/class/drm");
-        foreach (var cardDirectory in drmDirectory.GetDirectories("card*"))
+        DirectoryInfo drmDirectory = new("/sys/class/drm");
+        foreach (DirectoryInfo cardDirectory in drmDirectory.GetDirectories("card*"))
         {
-            foreach (var connectorDirectory in cardDirectory.GetDirectories("card*"))
+            foreach (DirectoryInfo connectorDirectory in cardDirectory.GetDirectories("card*"))
             {
-                var edidPath = Path.Combine(connectorDirectory.FullName, "edid");
+                string edidPath = Path.Combine(connectorDirectory.FullName, "edid");
 
                 if (File.Exists(edidPath))
                 {
@@ -154,11 +157,11 @@ static void Monitor()
         // Read the EDID file and extract the manufacturer and model information
         if (edidFile != null)
         {
-            var edidBytes = File.ReadAllBytes(edidFile);
+            byte[] edidBytes = File.ReadAllBytes(edidFile);
             if (edidBytes.Length > 0)
             {
-                var manufacturerCode = BitConverter.ToUInt16(edidBytes, 0x08);
-                var modelCode = BitConverter.ToUInt16(edidBytes, 0x0a);
+                ushort manufacturerCode = BitConverter.ToUInt16(edidBytes, 0x08);
+                ushort modelCode = BitConverter.ToUInt16(edidBytes, 0x0a);
             }
         }
     }

Hardware.Info.Test/Hardware.Info.Test.csproj

@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

Hardware.Info.Test/Program.cs

@@ -5,49 +5,58 @@ namespace Hardware.Info.Test
 {
     class Program
     {
-        static readonly IHardwareInfo _hardwareInfo = new HardwareInfo(useAsteriskInWMI: false);
-
         static void Main(string[] _)
         {
-            _hardwareInfo.RefreshOperatingSystem();
-            _hardwareInfo.RefreshMemoryStatus();
-            _hardwareInfo.RefreshBatteryList();
-            _hardwareInfo.RefreshBIOSList();
-            _hardwareInfo.RefreshCPUList(includePercentProcessorTime: false);
-            _hardwareInfo.RefreshDriveList();
-            _hardwareInfo.RefreshKeyboardList();
-            _hardwareInfo.RefreshMemoryList();
-            _hardwareInfo.RefreshMonitorList();
-            _hardwareInfo.RefreshMotherboardList();
-            _hardwareInfo.RefreshMouseList();
-            _hardwareInfo.RefreshNetworkAdapterList(includeBytesPerSec: false, includeNetworkAdapterConfiguration: true);
-            _hardwareInfo.RefreshPrinterList();
-            _hardwareInfo.RefreshSoundDeviceList();
-            _hardwareInfo.RefreshVideoControllerList();
+            Test(true);
+
+            Test(false);
+        }
+
+        static void Test(bool test)
+        {
+            IHardwareInfo hardwareInfo = new HardwareInfo(useAsteriskInWMI: test);
+
+            hardwareInfo.RefreshOperatingSystem();
+            hardwareInfo.RefreshMemoryStatus();
+            hardwareInfo.RefreshBatteryList();
+            hardwareInfo.RefreshBIOSList();
+            hardwareInfo.RefreshComputerSystemList();
+            hardwareInfo.RefreshCPUList(includePercentProcessorTime: test);
+            hardwareInfo.RefreshDriveList();
+            hardwareInfo.RefreshKeyboardList();
+            hardwareInfo.RefreshMemoryList();
+            hardwareInfo.RefreshMonitorList();
+            hardwareInfo.RefreshMotherboardList();
+            hardwareInfo.RefreshMouseList();
+            hardwareInfo.RefreshNetworkAdapterList(includeBytesPerSec: test, includeNetworkAdapterConfiguration: test);
+            hardwareInfo.RefreshPrinterList();
+            hardwareInfo.RefreshSoundDeviceList();
+            hardwareInfo.RefreshVideoControllerList();
 
             //hardwareInfo.RefreshAll();
 
-            Console.WriteLine(_hardwareInfo.OperatingSystem);
+            Console.WriteLine(hardwareInfo.OperatingSystem);
+
+            Console.WriteLine(hardwareInfo.MemoryStatus);
 
-            Console.WriteLine(_hardwareInfo.MemoryStatus);
+            foreach (var hardware in hardwareInfo.BatteryList)
+                Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.BatteryList)
+            foreach (var hardware in hardwareInfo.BiosList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.BiosList)
+            foreach (var hardware in hardwareInfo.ComputerSystemList)
                 Console.WriteLine(hardware);
 
-            foreach (var cpu in _hardwareInfo.CpuList)
+            foreach (var cpu in hardwareInfo.CpuList)
             {
                 Console.WriteLine(cpu);
 
                 foreach (var cpuCore in cpu.CpuCoreList)
                     Console.WriteLine(cpuCore);
             }
 
-            Console.ReadLine();
-
-            foreach (var drive in _hardwareInfo.DriveList)
+            foreach (var drive in hardwareInfo.DriveList)
             {
                 Console.WriteLine(drive);
 
@@ -60,37 +69,33 @@ static void Main(string[] _)
                 }
             }
 
-            Console.ReadLine();
-
-            foreach (var hardware in _hardwareInfo.KeyboardList)
+            foreach (var hardware in hardwareInfo.KeyboardList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.MemoryList)
+            foreach (var hardware in hardwareInfo.MemoryList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.MonitorList)
+            foreach (var hardware in hardwareInfo.MonitorList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.MotherboardList)
+            foreach (var hardware in hardwareInfo.MotherboardList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.MouseList)
+            foreach (var hardware in hardwareInfo.MouseList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.NetworkAdapterList)
+            foreach (var hardware in hardwareInfo.NetworkAdapterList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.PrinterList)
+            foreach (var hardware in hardwareInfo.PrinterList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.SoundDeviceList)
+            foreach (var hardware in hardwareInfo.SoundDeviceList)
                 Console.WriteLine(hardware);
 
-            foreach (var hardware in _hardwareInfo.VideoControllerList)
+            foreach (var hardware in hardwareInfo.VideoControllerList)
                 Console.WriteLine(hardware);
 
-            Console.ReadLine();
-
             foreach (var address in HardwareInfo.GetLocalIPv4Addresses(NetworkInterfaceType.Ethernet, OperationalStatus.Up))
                 Console.WriteLine(address);
 

Hardware.Info/Components/BIOS.cs

@@ -49,6 +49,10 @@ public class BIOS
         /// </summary>
         public string Version { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Write all property values to a string
+        /// </summary>
+        /// <returns>Each property on a new line</returns>
         public override string ToString()
         {
             return

Hardware.Info/Components/Battery.cs

@@ -61,6 +61,9 @@ public class Battery
 
         private string _batteryStatusDescription = string.Empty;
 
+        /// <summary>
+        /// Battery status description
+        /// </summary>
         public string BatteryStatusDescription
         {
             get => !string.IsNullOrEmpty(_batteryStatusDescription) ? _batteryStatusDescription : BatteryStatus switch
@@ -82,6 +85,10 @@ public string BatteryStatusDescription
             set => _batteryStatusDescription = value;
         }
 
+        /// <summary>
+        /// Write all property values to a string
+        /// </summary>
+        /// <returns>Each property on a new line</returns>
         public override string ToString()
         {
             return

Hardware.Info/Components/CPU.cs

@@ -111,8 +111,15 @@ public class CPU
         /// </summary>
         public UInt64 PercentProcessorTime { get; set; }
 
+        /// <summary>
+        /// List of <see cref="CpuCore" />
+        /// </summary>
         public List<CpuCore> CpuCoreList { get; set; } = new List<CpuCore>();
 
+        /// <summary>
+        /// Write all property values to a string
+        /// </summary>
+        /// <returns>Each property on a new line</returns>
         public override string ToString()
         {
             return

Hardware.Info/Components/ComputerSystem.cs

@@ -0,0 +1,69 @@
+using System;
+
+// https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-computersystemproduct
+
+namespace Hardware.Info
+{
+    /// <summary>
+    /// WMI class: Win32_ComputerSystemProduct
+    /// </summary>
+    public class ComputerSystem
+    {
+        /// <summary>
+        /// Short textual description for the product.
+        /// </summary>
+        public string Caption { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Textual description of the product.
+        /// </summary>
+        public string Description { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Product identification, such as a serial number on software, a die number on a hardware chip, or (for noncommercial products) a project number.
+        /// </summary>
+        public string IdentifyingNumber { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Commonly used product name.
+        /// </summary>
+        public string Name { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Product's stock-keeping unit (SKU) information.
+        /// </summary>
+        public string SKUNumber { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Universally unique identifier (UUID) for this product. A UUID is a 128-bit identifier that is guaranteed to be different from other generated UUIDs. If a UUID is not available, a UUID of all zeros is used.
+        /// </summary>
+        public string UUID { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Name of the product's supplier, or the entity selling the product (the manufacturer, reseller, OEM, and so on).
+        /// </summary>
+        public string Vendor { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Product version information.
+        /// </summary>
+        public string Version { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Write all property values to a string
+        /// </summary>
+        /// <returns>Each property on a new line</returns>
+        public override string ToString()
+        {
+            return
+                "Caption: " + Caption + Environment.NewLine +
+                "Description: " + Description + Environment.NewLine +
+                "IdentifyingNumber: " + IdentifyingNumber + Environment.NewLine +
+                "Name: " + Name + Environment.NewLine +
+                "SKUNumber: " + SKUNumber + Environment.NewLine +
+                "UUID: " + UUID + Environment.NewLine +
+                "Vendor: " + Vendor + Environment.NewLine +
+                "Version: " + Version + Environment.NewLine;
+        }
+    }
+}

Hardware.Info/Components/CpuCore.cs

@@ -23,6 +23,10 @@ public class CpuCore
         /// </summary>
         public UInt64 PercentProcessorTime { get; set; }
 
+        /// <summary>
+        /// Write all property values to a string
+        /// </summary>
+        /// <returns>Each property on a new line</returns>
         public override string ToString()
         {
             return