cleanup

Author: SimonCropp

readme.md

@@ -12,7 +12,7 @@ The package targets `netstandard2.0` and is designed to support the following ru
  * `net5.0`, `net6.0`, `net7.0`, `net8.0`, `net9.0`
 
 
-**API count: 460**<!-- singleLineInclude: apiCount. path: /apiCount.include.md -->
+**API count: 481**<!-- singleLineInclude: apiCount. path: /apiCount.include.md -->
 
 
 **See [Milestones](../../milestones?state=closed) for release notes.**
@@ -1019,6 +1019,31 @@ The class `Polyfill` includes the following extension methods:
  * `bool TryParse(string?, IFormatProvider?, long)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.int64.tryparse#system-int64-tryparse(system-string-system-iformatprovider-system-int64@))
 
 
+#### OperatingSystemPolyfill
+
+ * `bool IsAndroid()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isandroid)
+ * `bool IsAndroidVersionAtLeast(int, int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isandroidversionatleast)
+ * `bool IsBrowser()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isbrowser)
+ * `bool IsFreeBSD()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isfreebsd)
+ * `bool IsFreeBSDVersionAtLeast(int, int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isfreebsdversionatleast)
+ * `bool IsIOS()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isios)
+ * `bool IsIOSVersionAtLeast(int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.isiosversionatleast)
+ * `bool IsLinux()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.islinux)
+ * `bool IsMacCatalyst()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.ismaccatalyst)
+ * `bool IsMacCatalystVersionAtLeast(int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.ismaccatalystversionatleast)
+ * `bool IsMacOS()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.ismacos)
+ * `bool IsMacOSVersionAtLeast(int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.ismacosversionatleast)
+ * `bool IsOSPlatform(string)`
+ * `bool IsOSPlatformVersionAtLeast(string, int, int, int, int)`
+ * `bool IsTvOS()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.istvos)
+ * `bool IsTvOSVersionAtLeast(int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.istvosversionatleast)
+ * `bool IsWasi()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.iswasi)
+ * `bool IsWatchOS()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.iswatchos)
+ * `bool IsWatchOSVersionAtLeast(int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.iswatchosversionatleast)
+ * `bool IsWindows()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.iswindows)
+ * `bool IsWindowsVersionAtLeast(int, int, int, int)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.iswindowsversionatleast)
+
+
 #### PathPolyfill
 
  * `string Combine(ReadOnlySpan<string>)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.io.path.combine#system-io-path-combine(system-readonlyspan((system-string))))

src/Polyfill/OperatingSystemPolyfill.cs

@@ -20,33 +20,6 @@ namespace Polyfills;
 static class OperatingSystemPolyfill
 {
     #if !NET5_0_OR_GREATER
-    static Version GetWindowsVersion()
-    {
-        if (IsWindows())
-        {
-            var input = RuntimeInformation.OSDescription
-                .Replace("Microsoft Windows", string.Empty)
-                .Replace(" ", string.Empty);
-            return Version.Parse(input);
-        }
-
-        return Environment.OSVersion.Version;
-    }
-
-    static Version GetMacOSVersion()
-    {
-        if (!IsMacOS())
-        {
-            return Environment.OSVersion.Version;
-        }
-
-        var version = RunProcess("/usr/bin/sw_vers", "")
-            .Replace("ProductVersion:", string.Empty)
-            .Replace(" ", string.Empty);
-
-        return Version.Parse(version.Split(Environment.NewLine.ToCharArray())[0]);
-
-    }
 
     static Version GetFreeBSDVersion()
     {
@@ -149,13 +122,24 @@ public static bool IsWindows() =>
     /// <param name="revision">The revision release number.</param>
     /// <returns>true if the current application is running on a Windows version that is at least what was specified in the parameters; false otherwise.</returns>
     //Link: https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.iswindowsversionatleast
-    public static bool IsWindowsVersionAtLeast(int major, int minor = 0, int build = 0, int revision = 0) =>
+    public static bool IsWindowsVersionAtLeast(int major, int minor = 0, int build = 0, int revision = 0)
+    {
 #if NET5_0_OR_GREATER
-        OperatingSystem.IsWindowsVersionAtLeast(major, minor, build, revision);
+        return OperatingSystem.IsWindowsVersionAtLeast(major, minor, build, revision);
 #else
-        IsWindows() &&
-        GetWindowsVersion() >= new Version(major, minor, build, revision);
+        if (!IsWindows())
+        {
+            return false;
+        }
+
+        var input = RuntimeInformation.OSDescription
+                .Replace("Microsoft Windows", string.Empty)
+                .Replace(" ", string.Empty);
+        var version = Version.Parse(input);
+
+        return version >= new Version(major, minor, build, revision);
 #endif
+    }
 
     /// <summary>
     /// Indicates whether the current application is running on macOS.
@@ -190,13 +174,25 @@ public static bool IsMacCatalyst() =>
     /// <param name="build">The build release number.</param>
     /// <returns>true if the current application is running on an macOS version that is at least what was specified in the parameters; false otherwise.</returns>
     //Link: https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.ismacosversionatleast
-    public static bool IsMacOSVersionAtLeast(int major, int minor = 0, int build = 0) =>
+    public static bool IsMacOSVersionAtLeast(int major, int minor = 0, int build = 0)
+    {
 #if NET5_0_OR_GREATER
-        OperatingSystem.IsMacOSVersionAtLeast(major, minor, build);
+        return OperatingSystem.IsMacOSVersionAtLeast(major, minor, build);
 #else
-        IsMacOS() &&
-        GetMacOSVersion() >= new Version(major, minor, build);
+        if (!IsMacOS())
+        {
+            return false;
+        }
+
+        var versionString = RunProcess("/usr/bin/sw_vers", "")
+            .Replace("ProductVersion:", string.Empty)
+            .Replace(" ", string.Empty);
+
+        var version = Version.Parse(versionString.Split(Environment.NewLine.ToCharArray())[0]);
+
+        return version >= new Version(major, minor, build);
 #endif
+    }
 
     /// <summary>
     /// Check for the Mac Catalyst version (iOS version as presented in Apple documentation) with a ≤ version comparison. Used to guard APIs that were added in the given Mac Catalyst release.