Skip to content

Fix Windows 11 OS detection and Windows Server compatibility in validation reports #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 3 commits into from
Closed

Fix Windows 11 OS detection and Windows Server compatibility in validation reports #297

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b2132b
Initial plan
Copilot Sep 1, 2025
53aa015
Fix Windows 11 OS detection by checking build numbers and DisplayVersion
Copilot Sep 1, 2025
0992b9e
Fix Windows Server detection in Windows 11 logic
Copilot Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/InstallationValidator.Core/Domain/OperatingSystemInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,28 @@ public string FriendlyName
{
var productName = registryHKLMValue(WINDOWS_REG_KEY, "ProductName");
var version = registryHKLMValue(WINDOWS_REG_KEY, "CSDVersion");
var currentBuildNumber = registryHKLMValue(WINDOWS_REG_KEY, "CurrentBuildNumber");
var displayVersion = registryHKLMValue(WINDOWS_REG_KEY, "DisplayVersion");

if (string.IsNullOrEmpty(productName))
return Environment.OSVersion.VersionString;

// Windows 11 detection: Build number 22000 and above indicates Windows 11
// But only apply this to client Windows, not Windows Server editions
if (!string.IsNullOrEmpty(currentBuildNumber) && int.TryParse(currentBuildNumber, out var buildNumber) && buildNumber >= 22000
&& !productName.ToLower().Contains("server"))
Comment thread
Yuri05 marked this conversation as resolved.
Comment thread
Yuri05 marked this conversation as resolved.
{
var windows11Name = "Windows 11";

// Use DisplayVersion for Windows 11 version info if available
if (!string.IsNullOrEmpty(displayVersion))
{
windows11Name += $" {displayVersion}";
}

return windows11Name;
Comment on lines +50 to +58

Copilot AI Sep 1, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Windows 11 name construction logic doesn't handle the edition information (e.g., 'Pro', 'Home') that might be present in the original productName. Consider extracting and preserving the edition part from productName to maintain consistency with the existing behavior for Windows 10 systems.

Copilot uses AI. Check for mistakes.

@Yuri05 Yuri05 Sep 1, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Windows 11 name construction logic doesn't handle the edition information (e.g., 'Pro', 'Home') that might be present in the original productName. Consider extracting and preserving the edition part from productName to maintain consistency with the existing behavior for Windows 10 systems.

@copilot Copilot, implement this suggestion

}

var info = new[]
{
productName,
Expand Down
Loading