aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for detecting macOS 11 and 12.

Browse Source
This commit is contained in:
Natalia Portillo
2022-04-10 10:17:05 +01:00
parent 1338178726
commit f0adf40189
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Interop/DetectOS.cs
View File

@@ -79,7 +79,7 @@ public static class DetectOS
{ {
get get
{ {
if(!IsWindows) if(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
return Environment.UserName == "root"; return Environment.UserName == "root";
bool isAdmin; bool isAdmin;
@@ -223,6 +223,9 @@ public static class DetectOS
switch(GetRealPlatformID()) switch(GetRealPlatformID())
{ {
case PlatformID.MacOSX: case PlatformID.MacOSX:
if(Environment.OSVersion.Version.Major >= 11)
return environ;
if(Environment.OSVersion.Version.Major != 1) if(Environment.OSVersion.Version.Major != 1)
return $"10.{Environment.OSVersion.Version.Major - 4}.{Environment.OSVersion.Version.Minor}"; return $"10.{Environment.OSVersion.Version.Major - 4}.{Environment.OSVersion.Version.Minor}";
@@ -281,13 +284,13 @@ public static class DetectOS
!int.TryParse(pieces[1], out int minor)) !int.TryParse(pieces[1], out int minor))
return "macOS"; return "macOS";
if(minor >= 12) int.TryParse(pieces[0], out int major);
if(minor >= 12 ||
major >= 11)
return "macOS"; return "macOS";
if(minor >= 8) return minor >= 8 ? "OS X" : "Mac OS X";
return "OS X";
return "Mac OS X";
case PlatformID.Minix: return "MINIX"; case PlatformID.Minix: return "MINIX";
case PlatformID.NetBSD: return "NetBSD"; case PlatformID.NetBSD: return "NetBSD";