From 3457e9c95b44bad72620d7209e8b632a84498e99 Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Thu, 21 Oct 2021 16:47:40 -0700 Subject: [PATCH 1/2] Add 21H2 definitions to osversion package This change adds three new definitions to the osversion package. All three definitions are all of the 21H2 builds across Windows 10, Windows Server and Windows 11, which all have different build numbers. The approach taken was to prefix the definitions with Win10, WinServer and Win11 respectively. Signed-off-by: Daniel Canter --- osversion/windowsbuilds.go | 9 +++++++++ .../Microsoft/hcsshim/osversion/windowsbuilds.go | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/osversion/windowsbuilds.go b/osversion/windowsbuilds.go index 49fb740cd1..313afaa078 100644 --- a/osversion/windowsbuilds.go +++ b/osversion/windowsbuilds.go @@ -38,4 +38,13 @@ const ( // V21H1 corresponds to Windows Server 21H1 (semi-annual channel). V21H1 = 19043 + + // Win10V21H2 corresponds to Windows 10 (November 2021 Update). + Win10V21H2 = 19044 + + // WinServerV21H2 corresponds to Windows Server 2022 (ltsc2022). + WinServerV21H2 = 20348 + + // Win11V21H2 corresponds to Windows 11 (original release). + Win11V21H2 = 22000 ) diff --git a/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go b/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go index 49fb740cd1..313afaa078 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go +++ b/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go @@ -38,4 +38,13 @@ const ( // V21H1 corresponds to Windows Server 21H1 (semi-annual channel). V21H1 = 19043 + + // Win10V21H2 corresponds to Windows 10 (November 2021 Update). + Win10V21H2 = 19044 + + // WinServerV21H2 corresponds to Windows Server 2022 (ltsc2022). + WinServerV21H2 = 20348 + + // Win11V21H2 corresponds to Windows 11 (original release). + Win11V21H2 = 22000 ) From 3809b8e8b2c593850b1dda7bfa882e986a1b38e9 Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Wed, 10 Nov 2021 14:12:40 -0800 Subject: [PATCH 2/2] Suggestion: Change to using a prefix approach for the naming Signed-off-by: Daniel Canter --- osversion/windowsbuilds.go | 12 ++++++------ .../Microsoft/hcsshim/osversion/windowsbuilds.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/osversion/windowsbuilds.go b/osversion/windowsbuilds.go index 313afaa078..75dce5d821 100644 --- a/osversion/windowsbuilds.go +++ b/osversion/windowsbuilds.go @@ -39,12 +39,12 @@ const ( // V21H1 corresponds to Windows Server 21H1 (semi-annual channel). V21H1 = 19043 - // Win10V21H2 corresponds to Windows 10 (November 2021 Update). - Win10V21H2 = 19044 + // V21H2Win10 corresponds to Windows 10 (November 2021 Update). + V21H2Win10 = 19044 - // WinServerV21H2 corresponds to Windows Server 2022 (ltsc2022). - WinServerV21H2 = 20348 + // V21H2Server corresponds to Windows Server 2022 (ltsc2022). + V21H2Server = 20348 - // Win11V21H2 corresponds to Windows 11 (original release). - Win11V21H2 = 22000 + // V21H2Win11 corresponds to Windows 11 (original release). + V21H2Win11 = 22000 ) diff --git a/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go b/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go index 313afaa078..75dce5d821 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go +++ b/test/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go @@ -39,12 +39,12 @@ const ( // V21H1 corresponds to Windows Server 21H1 (semi-annual channel). V21H1 = 19043 - // Win10V21H2 corresponds to Windows 10 (November 2021 Update). - Win10V21H2 = 19044 + // V21H2Win10 corresponds to Windows 10 (November 2021 Update). + V21H2Win10 = 19044 - // WinServerV21H2 corresponds to Windows Server 2022 (ltsc2022). - WinServerV21H2 = 20348 + // V21H2Server corresponds to Windows Server 2022 (ltsc2022). + V21H2Server = 20348 - // Win11V21H2 corresponds to Windows 11 (original release). - Win11V21H2 = 22000 + // V21H2Win11 corresponds to Windows 11 (original release). + V21H2Win11 = 22000 )