Skip to content

Detect Windows 8.1 #424

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

Merged
merged 1 commit into from
Oct 23, 2018
Merged

Detect Windows 8.1 #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/Microsoft.AspNetCore.Testing/xunit/MinimumOsVersionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,25 @@ private static Version GetCurrentOSVersion()
// currently not used on other OS's
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Environment.OSVersion doesn't work past Win8.
// Win10+
var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
var major = key.GetValue("CurrentMajorVersionNumber") as int?;
var minor = key.GetValue("CurrentMinorVersionNumber") as int?;

if (!major.HasValue || !minor.HasValue)
if (major.HasValue && minor.HasValue)
{
return Environment.OSVersion.Version;
return new Version(major.Value, minor.Value);
}

return new Version(major.Value, minor.Value);
// CurrentVersion doesn't work past Win8.1
var current = key.GetValue("CurrentVersion") as string;
if (!string.IsNullOrEmpty(current) && Version.TryParse(current, out var currentVersion))
{
return currentVersion;
}

// Environment.OSVersion doesn't work past Win8.
return Environment.OSVersion.Version;
}
else
{
Expand Down