Merge branch 'release/5.25.0'

Release 5.25.0
ddablib · Dec 3, 2023 · 33ed94d · 33ed94d
2 parents eb05a00 + c17da30
commit 33ed94d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log for System Information Unit
 
+## v5.25.0 of 03 December 2023
+
+Update OS detection of Win10/11 in Nov 23 re:
+
++ Updated TPJOSInfo to detect various Windows 10 and 11 builds and revisions release in November 2023:
+  + Windows 10 version 21H2 & 22H2 public & release preview revisions.
+  + Windows 11 21H2, 22H2 & 23H2 public, beta & release preview channel revisions.
+  + Windows 11 Dev & Canary channel revisions.
+  + Windows 11 Future Component Update Beta builds.
+
 ## v5.24.0 of 03 November 2023
 
 + Updated TPJOSInfo:

diff --git a/PJSysInfo.pas b/PJSysInfo.pas
@@ -1484,7 +1484,7 @@   TBuildNameMap = record
 
   // Windows 11 Dev channel releases (with version string "Dev", changing to
   // 22H2 at build 22567) [^2].
-  Win11DevChannelDevBuilds: array[0..11] of Integer = (
+  Win11DevChannelDevBuilds: array[0..14] of Integer = (
     // pre Win 11 release (expired 2021/10/31):
     //   22449, 22454, 22458, 22463,
     // pre Win 11 release (expired 2022/09/15):
@@ -1506,17 +1506,18 @@   TBuildNameMap = record
     //    23511, 23516, 23521,
     // (expiring 2024-09-15)
     23526, 23531, 23536, 23541, 23545, 23550, 23555, 23560, 23565, 23570, 23575,
-    23580
+    23580, 23585, 23590, 23595
   );
 
   // Preview builds of Windows 11 in the Canary Channel [^2]
-  Win11CanaryPreviewBuilds: array[0..8] of Integer = (
+  Win11CanaryPreviewBuilds: array[0..11] of Integer = (
     // With version string "22H2" (expired 2023-09-15):
     //    25314, 25324, 25330, 25336, 25346, 25352, 25357, 25370,
     // With version string "22H3" (expired 2023-09-15):
     //    25375, 25381, 25387, 25393, 25905, 25915, 25921, 25926,
     // With version string "22H3" (expires 2024-09-15):
-    25931, 25936, 25941, 25947, 25951, 25967, 25977, 25982, 25987
+    25931, 25936, 25941, 25947, 25951, 25967, 25977, 25982, 25987, 25992, 25997,
+    26002
   );
 
   // Windows 11 Dev & Beta channel builds with version string "22H2" [^2]
@@ -2185,7 +2186,7 @@ procedure InitPlatformIdEx;
                 1620, 1645, 1682, 1706, 1708, 1741, 1766, 1767, 1806, 1826,
                 1865, 1889, 1949, 2006, 2075, 2130, 2132, 2193, 2194, 2251,
                 2311, 2364, 2486, 2546, 2604, 2673, 2728, 2788, 2846, 2965,
-                3086, 3208, 3324, 3448, 3570 .. MaxInt:
+                3086, 3208, 3324, 3448, 3570, 3693 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 21H2';
                 1147, 1149, 1151, 1165, 1200, 1202, 1237, 1263, 1266, 1319,
                 1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862,
@@ -2208,10 +2209,11 @@ procedure InitPlatformIdEx;
               case InternalBuildNumber of
                 2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364, 2486, 2546,
                 2604, 2673, 2728, 2788, 2846, 2913, 2965, 3031, 3086,
-                3208, 3271, 3324, 3393, 3448, 3516, 3570, 3636 .. MaxInt:
+                3208, 3271, 3324, 3393, 3448, 3516, 3570, 3636, 3693, 3758 
+                .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 22H2';
                 1865, 1889, 1949, 2075, 2301, 2670, 2787, 2908, 3030, 3154,
-                3155, 3269, 3391, 3513:
+                3155, 3269, 3391, 3513, 3754, 3757:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2247,7 +2249,7 @@ procedure InitPlatformIdEx;
                 652, 675, 708, 739, 740, 778, 795, 832, 856, 918, 978, 1042,
                 1098, 1100, 1165, 1219, 1281, 1335, 1455, 1516, 1574, 1641,
                 1696, 1761, 1817, 1880, 1936, 2003, 2057, 2124, 2176, 2245,
-                2295, 2360, 2416, 2482, 2538 .. MaxInt:
+                2295, 2360, 2416, 2482, 2538, 2600 .. MaxInt:
                   // Public releases of Windows 11
                   InternalExtraUpdateInfo := 'Version 21H2';
                 51, 65, 71:
@@ -2286,7 +2288,8 @@ procedure InitPlatformIdEx;
               case InternalRevisionNumber of
                 382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1105, 1194,
                 1265, 1344, 1413, 1485, 1555, 1635, 1702, 1778, 1848, 1926,
-                1928, 1992, 2070, 2134, 2215, 2283, 2361, 2428, 2506 .. MaxInt:
+                1928, 1992, 2070, 2134, 2215, 2283, 2361, 2428, 2506, 2715,
+                {placeholder} 2788 .. MaxInt:
                 begin
                   InternalExtraUpdateInfo := 'Version 22H2';
                   case InternalRevisionNumber of
@@ -2302,7 +2305,7 @@ procedure InitPlatformIdEx;
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 105, 169, 232, 317, 457, 607, 754, 898, 1192, 1343, 1483, 1631,
-                1776, 2066, 2213, 2359, 2500:
+                1776, 2066, 2213, 2359, 2500, 2787:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2328,7 +2331,7 @@ procedure InitPlatformIdEx;
               // **REF10**
               InternalBuildNumber := Win11v23H2Build;
               case InternalRevisionNumber of
-                2428, 2506:
+                2428, 2506, 2715, {placeholder} 2788 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 23H2';
                 1825, 1830, 1835, 1900, 1906, 1972:
                   // revisions 1825..1972 had version string "22H2"
@@ -2341,7 +2344,7 @@ procedure InitPlatformIdEx;
                     'Version 23H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                2361:
+                2361, 2787:
                   InternalExtraUpdateInfo := Format(
                     'Version 23H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2448,7 +2451,7 @@ procedure InitPlatformIdEx;
               // **REF9**
               InternalBuildNumber := Win11FutureComponentBetaChannelBuild;
               case InternalRevisionNumber of
-                2419, 2483, 2486, 2552, 2700 .. MaxInt:
+                2419, 2483, 2486, 2552, 2700, 2771, 2776 .. MaxInt:
                   InternalExtraUpdateInfo := Format(
                     'Future Component Update Beta v10.0.%d.%d',
                     [InternalBuildNumber, InternalRevisionNumber]