Skip to content

[2.64.x] Update Native.DetectWindowsVersion() to consider Windows Server 2019 to be Window Server #2473

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
Jul 1, 2024
Merged

[2.64.x] Update Native.DetectWindowsVersion() to consider Windows Server 2019 to be Window Server #2473

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
4 changes: 2 additions & 2 deletions src/Grpc.Net.Client/Internal/Native.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ internal static class Native
internal static void DetectWindowsVersion(out Version version, out bool isWindowsServer)
{
// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-osversioninfoexa
const byte VER_NT_SERVER = 3;
const byte VER_NT_WORKSTATION = 1;

var osVersionInfo = new OSVERSIONINFOEX { OSVersionInfoSize = Marshal.SizeOf<OSVERSIONINFOEX>() };

Expand All @@ -46,7 +46,7 @@ internal static void DetectWindowsVersion(out Version version, out bool isWindow
}

version = new Version(osVersionInfo.MajorVersion, osVersionInfo.MinorVersion, osVersionInfo.BuildNumber, 0);
isWindowsServer = osVersionInfo.ProductType == VER_NT_SERVER;
isWindowsServer = osVersionInfo.ProductType != VER_NT_WORKSTATION;
}

internal static bool IsUwp(string frameworkDescription, Version version)
Expand Down