diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-12-22 13:45:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-22 13:45:20 -0800 |
| commit | 4db95dc15af48a965aed7f7c22e267ad2a900980 (patch) | |
| tree | 59e2de077919cf5a8569b6f8fbbbf52b365e9d88 | |
| parent | 52411e2d66ce4a339caab3e408d234d97b1606fa (diff) | |
| parent | fbbee66c52f2f95421b635831ff65b21cbba5299 (diff) | |
| download | chef-4db95dc15af48a965aed7f7c22e267ad2a900980.tar.gz | |
Merge pull request #13461 from chef/jfm/chef16_version_errors_part_2
Versions were overlapping with Windows 10. This corrects
| -rw-r--r-- | lib/chef/win32/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/win32/version.rb b/lib/chef/win32/version.rb index d9ce79de9e..a4a196ed4a 100644 --- a/lib/chef/win32/version.rb +++ b/lib/chef/win32/version.rb @@ -52,7 +52,7 @@ class Chef "Windows Server 2022" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 20348 } }, "Windows Server 2019" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 17763 && build_number < 20348 } }, "Windows 11" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION && build_number >= 22000 } }, - "Windows 10" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION } }, + "Windows 10" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION && build_number >= 19044 && build_number < 22000 } }, "Windows Server 2016" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number <= 14393 } }, "Windows 8.1" => { major: 6, minor: 3, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION } }, "Windows Server 2012 R2" => { major: 6, minor: 3, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION } }, |