From d23f47c29836a52839939e8765a5e864f8f4d984 Mon Sep 17 00:00:00 2001
From: Peter Simpson <38855929+Peter-Simpson@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:17:54 +0100
Subject: [PATCH] Improve OS version reporting.

---
 .../Conform/DeviceTesterBaseClass/DeviceTesterBaseClass.cs | 7 ++++++-
 ConformU/Pages/Index.razor                                 | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ConformU/Conform/DeviceTesterBaseClass/DeviceTesterBaseClass.cs b/ConformU/Conform/DeviceTesterBaseClass/DeviceTesterBaseClass.cs
index b8da38c..d86a0cf 100644
--- a/ConformU/Conform/DeviceTesterBaseClass/DeviceTesterBaseClass.cs
+++ b/ConformU/Conform/DeviceTesterBaseClass/DeviceTesterBaseClass.cs
@@ -1016,6 +1016,11 @@ public virtual void InitialiseTest()
             LogTestOnly($"ASCOM Universal Device Conformance Checker Version {this.GetType().Assembly.GetName().Version}, Build time: {lastModifiedTime:ddd dd MMMM yyyy HH:mm:ss}");
             LogNewLine(); // Blank line
 
+            // Set the architecture and bitness
+            string architecture = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "ARM" : "Intel";
+            string osBitness = Environment.Is64BitOperatingSystem ? "64" : "32";
+            string processBitness = Environment.Is64BitProcess ? "64" : "32"+OperatingSystem.pl;
+
             // Set the OS name depending on whether or not it is Windows
             string osName;
 #if WINDOWS
@@ -1023,7 +1028,7 @@ public virtual void InitialiseTest()
 #else
             osName = RuntimeInformation.OSDescription;
 #endif
-            LogTestOnly($"Operating system is {osName} {(Environment.Is64BitOperatingSystem ? "64bit" : "32bit")}, Application is {(Environment.Is64BitProcess ? "64bit" : "32bit")}.");
+            LogTestOnly($"Operating system is {osName}, Processor is {architecture} {osBitness}bit, Application is {processBitness}bit.");
             LogNewLine(); // Blank line
 
             switch (settings.DeviceTechnology)
diff --git a/ConformU/Pages/Index.razor b/ConformU/Pages/Index.razor
index a46b007..52afd51 100644
--- a/ConformU/Pages/Index.razor
+++ b/ConformU/Pages/Index.razor
@@ -98,7 +98,7 @@
 
         string processBitness = Environment.Is64BitProcess ? "64bit" : "32bit";
         string osBitness = Environment.Is64BitOperatingSystem ? "64bit" : "32bit";
-        string architecture = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "ARM" : "Intel";
+        string architecture = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "ARM" : "Intel/AMD";
         string osName;
 
         // Select the best descriptive name depending on OS.