Skip to content

Commit 061d162

Browse files
Merge pull request #19 from dermsd/main
Detect Windows Server 2025
2 parents 5041704 + 8886c0d commit 061d162

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

lib/facter/util/facts/windows_release_finder.rb

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,15 @@ def find_release(input)
2525
def check_version_10_11(consumerrel, kernel_version)
2626
build_number = kernel_version[/([^.]*)$/].to_i
2727

28-
return '11' if build_number >= 22_000
29-
return '10' if consumerrel
30-
31-
if build_number >= 20_348
28+
if consumerrel
29+
if build_number >= 22_000
30+
'11'
31+
else
32+
'10'
33+
end
34+
elsif build_number >= 26_100
35+
'2025'
36+
elsif build_number >= 20_348
3237
'2022'
3338
elsif build_number >= 17_623
3439
'2019'

spec/facter/util/facts/windows_release_finder_spec.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@
3636
end
3737
end
3838

39+
describe '#find windows release when version is 2025' do
40+
let(:cons) { false }
41+
let(:desc) {}
42+
let(:k_version) { '10.0.26100' }
43+
let(:version) { '10.0' }
44+
45+
it 'returns 2025' do
46+
expect(Facter::Util::Facts::WindowsReleaseFinder.find_release(input)).to eql('2025')
47+
end
48+
end
49+
3950
describe '#find windows release when version is 2022' do
4051
let(:cons) { false }
4152
let(:desc) {}

0 commit comments

Comments
 (0)