Skip to content

Commit 36f3638

Browse files
pejovicahamzaGhaissi
authored andcommitted
Update OS detection code to recognize Windows 11 and Windows Server 2022
(cherry picked from commit b58732b)
1 parent 4b8f700 commit 36f3638

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSystemPropertiesSupport.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,15 +356,21 @@ public Pair<String, String> getOsNameAndVersion() {
356356
if (isWorkstation) {
357357
switch (minorVersion) {
358358
case 0:
359-
osName = "Windows 10";
359+
if (buildNumber >= 22000) {
360+
osName = "Windows 11";
361+
} else {
362+
osName = "Windows 10";
363+
}
360364
break;
361365
default:
362366
osName = "Windows NT (unknown)";
363367
}
364368
} else {
365369
switch (minorVersion) {
366370
case 0:
367-
if (buildNumber > 17762) {
371+
if (buildNumber > 20347) {
372+
osName = "Windows Server 2022";
373+
} else if (buildNumber > 17762) {
368374
osName = "Windows Server 2019";
369375
} else {
370376
osName = "Windows Server 2016";

0 commit comments

Comments
 (0)