Use OperatingSystem where possible

Author: Tyrrrz

PolyShim.Tests/Net50/ProcessTests.cs

@@ -1,5 +1,5 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
+using System;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
@@ -16,10 +16,8 @@ public async Task WaitForExitAsync_Test()
         {
             StartInfo = new ProcessStartInfo
             {
-                FileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "cmd" : "sh",
-                Arguments = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                    ? "/c timeout 1"
-                    : "-c 'sleep 1'",
+                FileName = OperatingSystem.IsWindows() ? "cmd" : "sh",
+                Arguments = OperatingSystem.IsWindows() ? "/c timeout 1" : "-c 'sleep 1'",
                 CreateNoWindow = true,
                 UseShellExecute = false,
             },

PolyShim.Tests/NetCore30/ProcessTests.cs

@@ -1,5 +1,5 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
+using System;
+using System.Diagnostics;
 using FluentAssertions;
 using Xunit;
 
@@ -15,10 +15,8 @@ public void Kill_Test()
         {
             StartInfo = new ProcessStartInfo
             {
-                FileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "cmd" : "sh",
-                Arguments = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                    ? "/c timeout 1"
-                    : "-c 'sleep 1'",
+                FileName = OperatingSystem.IsWindows() ? "cmd" : "sh",
+                Arguments = OperatingSystem.IsWindows() ? "/c timeout 1" : "-c 'sleep 1'",
                 CreateNoWindow = true,
                 UseShellExecute = false,
             },

PolyShim/NetCore20/Path.cs

@@ -8,7 +8,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 
 internal static partial class PolyfillExtensions
 {
@@ -19,7 +18,7 @@ internal static partial class PolyfillExtensions
         // https://learn.microsoft.com/dotnet/api/system.io.path.getrelativepath
         public static string GetRelativePath(string relativeTo, string path)
         {
-            var pathStringComparison = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+            var pathStringComparison = OperatingSystem.IsWindows()
                 ? StringComparison.OrdinalIgnoreCase
                 : StringComparison.Ordinal;
 

PolyShim/NetCore30/Process.cs

@@ -9,7 +9,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Management;
-using System.Runtime.InteropServices;
 
 internal static partial class PolyfillExtensions
 {
@@ -54,7 +53,7 @@ static void KillProcessTree(int processId)
             }
 
             // Currently, this polyfill only supports Windows
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (!OperatingSystem.IsWindows())
             {
                 process.Kill();
                 return;