Skip to content

Commit 52f892a

Browse files
committed
Fix incorrect architecture report on a 32bit ARM processor.
1 parent f0ae4cf commit 52f892a

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

ConformU/Conform/DeviceTesterBaseClass/DeviceTesterBaseClass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ public virtual void InitialiseTest()
10171017
LogNewLine(); // Blank line
10181018

10191019
// Set the architecture and bitness
1020-
string architecture = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "ARM" : "Intel/AMD";
1020+
string architecture = ((RuntimeInformation.ProcessArchitecture == Architecture.Arm64) | (RuntimeInformation.ProcessArchitecture == Architecture.Arm)) ? "ARM" : "Intel/AMD";
10211021
string osBitness = Environment.Is64BitOperatingSystem ? "64" : "32";
10221022
string processBitness = Environment.Is64BitProcess ? "64" : "32";
10231023

ConformU/Pages/Index.razor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696

9797
statusMessage = $"Version {Update.ConformuVersionDisplayString}";
9898

99-
string processBitness = Environment.Is64BitProcess ? "64bit" : "32bit";
100-
string osBitness = Environment.Is64BitOperatingSystem ? "64bit" : "32bit";
101-
string architecture = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "ARM" : "Intel/AMD";
99+
string processBitness = Environment.Is64BitProcess ? "64" : "32";
100+
string osBitness = Environment.Is64BitOperatingSystem ? "64" : "32";
101+
string architecture = ((RuntimeInformation.ProcessArchitecture == Architecture.Arm64) | (RuntimeInformation.ProcessArchitecture == Architecture.Arm)) ? "ARM" : "Intel/AMD";
102102
string osName;
103103

104104
// Select the best descriptive name depending on OS.
@@ -108,7 +108,7 @@
108108
osName = Environment.OSVersion.ToString();
109109
#endif
110110

111-
statusMessage += $" Running as a {processBitness} application on a {osBitness} {architecture} processor. OS: {osName}";
111+
statusMessage += $" Running as a {processBitness}bit application on a {osBitness}bit {architecture} processor. OS: {osName}";
112112

113113
// Validate that the application SEMVER string is valid
114114
if (SemVersion.TryParse(Update.ConformuVersion, SemVersionStyles.AllowV, out SemVersion currentversion))

0 commit comments

Comments
 (0)