Correctly reporting Windows 11 version

Author: ChrisMaunder

src/SDK/NET/Utils/SystemInfo.cs

@@ -697,7 +697,7 @@ public static string OperatingSystemDescription
                     description = $"{OperatingSystem} ({OperatingSystemName} {OperatingSystemVersion}";
 
                 if (!OperatingSystemCodeName.StartsWith(OperatingSystem))
-                    description += $" \"{OperatingSystemCodeName}\"";
+                    description += $" {OperatingSystemCodeName}";
 
                 description += ")";
 
@@ -1743,6 +1743,19 @@ private async static Task GetOsDetailsAsync()
                     {
                         _osVersion  = "11";
                         _osCodeName = "Sun Valley";
+
+                        string command = "reg";
+                        string args    = "query \"HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\" /v DisplayVersion";
+                        string pattern = "DisplayVersion    REG_SZ    (?<version>[A-Z\\d]+)";
+                        var    options = RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
+
+                        var results = await GetProcessInfoAsync(command, args, pattern, options).ConfigureAwait(false);
+                        if (results is not null)
+                        {
+                            string? version = results["version"]?.Trim();       // eg. "23H2"
+                            if (!string.IsNullOrWhiteSpace(version))
+                                _osCodeName = version;
+                        }
                     }
                     else
                     {

src/scripts/utils.bat

@@ -2007,6 +2007,9 @@ REM Get Windows Version
         if !ver_build! GEQ 22000 (
             set "windows_version=Windows 11"
             set "os_code_name=Sun Valley"
+            for /f "tokens=2,*" %%A in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v DisplayVersion 2^>nul ^| find "DisplayVersion"') do (
+                set os_code_name=%%B
+            )
         ) else (
             set "windows_version=Windows 10"
             set "os_code_name=Redstone"

src/setup.bat

@@ -352,6 +352,7 @@ set freeSpaceBytes=!freeSpaceBytes:,=!
 set /a freeSpaceGb=!freeSpaceBytes:~0,-3! / 1048576
 set /a freeSpaceGbFraction=!freeSpaceBytes:~0,-3! %% 1048576 * 10 / 1048576
 
+if "!volumeName!" == "no" set volumeName=(No label)
 if "!volumeName!" == "" set volumeName=(No label)
 
 
@@ -389,7 +390,7 @@ call "!utilsScript!" WriteLine ""
 :: Output settings
 if /i "%verbosity%" neq "quiet" (
     call "!utilsScript!" WriteLine 
-    call "!utilsScript!" WriteLine "os, name, arch              = !os! !os_name! !architecture!" !color_mute!
+    call "!utilsScript!" WriteLine "os, name, arch              = !os! !os_name! (!os_code_name!) !architecture!" !color_mute!
     call "!utilsScript!" WriteLine "systemName, platform        = !systemName!, !platform!"      !color_mute!
     call "!utilsScript!" WriteLine "edgeDevice                  = !edgeDevice!"                  !color_mute!
     call "!utilsScript!" WriteLine "setupMode                   = !setupMode!"                   !color_mute!