Update Native.DetectWindowsVersion() to consider Windows Server 2019 to be Window Server (#2468)

wrall · web-flow · commit 462331810006 · 2024-06-26T16:04:45.000+08:00
diff --git a/src/Grpc.Net.Client/Internal/Native.cs b/src/Grpc.Net.Client/Internal/Native.cs
@@ -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>() };
 
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ internal static class Native`
`36`	`36`	`internal static void DetectWindowsVersion(out Version version, out bool isWindowsServer)`
`37`	`37`	`{`
`38`	`38`	`// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-osversioninfoexa`
`39`		`- const byte VER_NT_SERVER = 3;`
	`39`	`+ const byte VER_NT_WORKSTATION = 1;`
`40`	`40`
`41`	`41`	`var osVersionInfo = new OSVERSIONINFOEX { OSVersionInfoSize = Marshal.SizeOf<OSVERSIONINFOEX>() };`
`42`	`42`
`@@ -46,7 +46,7 @@ internal static void DetectWindowsVersion(out Version version, out bool isWindow`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`version = new Version(osVersionInfo.MajorVersion, osVersionInfo.MinorVersion, osVersionInfo.BuildNumber, 0);`
`49`		`- isWindowsServer = osVersionInfo.ProductType == VER_NT_SERVER;`
	`49`	`+ isWindowsServer = osVersionInfo.ProductType != VER_NT_WORKSTATION;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`internal static bool IsUwp(string frameworkDescription, Version version)`