OSDN Git Service

Windows 10の確認方法を修正。RtlGetVersion()を呼び出すことで実現
authorttp <ttp@users.sourceforge.jp>
Sun, 13 Mar 2016 10:51:01 +0000 (19:51 +0900)
committerttp <ttp@users.sourceforge.jp>
Sun, 13 Mar 2016 10:51:01 +0000 (19:51 +0900)
na-get-lib/NaGet.Packages/Platform.cs

index 4fec91b..c463f21 100644 (file)
@@ -177,7 +177,11 @@ namespace NaGet.Packages
                                                int osVerMinor = osVer.Minor;\r
                                                NaGet.InteropServices.WindowsVersion.VersionInfo? verInfo = NaGet.InteropServices.WindowsVersion.GetVersionInfo();\r
                                                if (verInfo.HasValue) {\r
-                                                       osVerMinor = (int) verInfo.Value.MinorVersion;\r
+                                                       if (verInfo.Value.MajorVersion == 10) {\r
+                                                               return PlatformOSType.WIN10;\r
+                                                       } else {\r
+                                                               osVerMinor = (int) verInfo.Value.MinorVersion;\r
+                                                       }\r
                                                }\r
                                                switch (osVerMinor) {\r
                                                        case 0:\r
@@ -188,8 +192,6 @@ namespace NaGet.Packages
                                                                return PlatformOSType.WIN8;\r
                                                        case 3:\r
                                                                return PlatformOSType.WIN8_1;\r
-                                                       case 4:\r
-                                                               return PlatformOSType.WIN10;\r
                                                }\r
                                        }\r
                                        break;\r