Merge pull request unoplatform#15426 from Youssef1313/os-checks

refactor: Simplify OS checks
ramezgerges · Feb 10, 2024 · 2723190 · 2723190
2 parents 0c8b4c5 + 13462f0
commit 2723190
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 23 deletions.
diff --git a/src/AddIns/Uno.UI.MediaPlayer.Skia.Gtk/VideoView.cs b/src/AddIns/Uno.UI.MediaPlayer.Skia.Gtk/VideoView.cs
@@ -62,7 +62,7 @@ struct Native
 		/// </summary>
 		public VideoView()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+			if (OperatingSystem.IsLinux())
 			{
 #pragma warning disable CA1806 // Do not ignore method results
 				Native.XInitThreads();

diff --git a/src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs b/src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs
@@ -80,7 +80,7 @@ static SampleControlUITestBase()
 		private static void TryInitializeSkiaSharpLoader()
 		{
 			if (AppInitializer.GetLocalPlatform() == Platform.Browser
-				&& !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+				&& !OperatingSystem.IsWindows())
 			{
 #if DEBUG
 				Console.WriteLine("Initializing SkiaSharp loader");

diff --git a/src/Uno.UI.RemoteControl.Server.Processors/Helpers/ProcessHelper.cs b/src/Uno.UI.RemoteControl.Server.Processors/Helpers/ProcessHelper.cs
@@ -13,7 +13,7 @@ internal class ProcessHelper
 	{
 		public static (int exitCode, string output, string error) RunProcess(string executable, string parameters, string? workingDirectory = null)
 		{
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+			if (!OperatingSystem.IsWindows()
 				&& executable.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
 			{
 				executable = Path.GetFileNameWithoutExtension(executable);

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/GtkHost.HarfbuzzPreload.cs b/src/Uno.UI.Runtime.Skia.Gtk/GtkHost.HarfbuzzPreload.cs
@@ -10,7 +10,7 @@ public partial class GtkHost : ISkiaApplicationHost
 	{
 		private void PreloadHarfBuzz()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+			if (OperatingSystem.IsLinux())
 			{
 				// Here, we preload libHarfBuzzSharp.so using the RTLD_DEEPBIND flag, so that
 				// is loaded with its static dependencies, and not the ones from the system, particularly

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Helpers/Dpi/DpiHelper.cs b/src/Uno.UI.Runtime.Skia.Gtk/Helpers/Dpi/DpiHelper.cs
@@ -73,7 +73,7 @@ internal float GetNativeDpi()
 		}
 
 		float dpi;
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+		if (OperatingSystem.IsWindows())
 		{
 			dpi = DpiUtilities.GetDpiForWindow(DpiUtilities.GetWin32Hwnd(GetWindow().Window));
 		}

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Helpers/Theming/GtkSystemThemeHelperExtension.cs b/src/Uno.UI.Runtime.Skia.Gtk/Helpers/Theming/GtkSystemThemeHelperExtension.cs
@@ -23,7 +23,7 @@ internal GtkSystemThemeHelperExtension(object owner)
 
 		private void ObserveSystemTheme()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			if (OperatingSystem.IsWindows())
 			{
 				SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
 			}
@@ -37,7 +37,7 @@ private void ObserveSystemTheme()
 
 		private void UnobserveSystemTheme()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			if (OperatingSystem.IsWindows())
 			{
 				SystemEvents.UserPreferenceChanged -= SystemEvents_UserPreferenceChanged;
 			}
@@ -66,7 +66,7 @@ private bool IsGtkThemeDark(string themeName)
 
 		public SystemTheme GetSystemTheme()
 		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			if (OperatingSystem.IsWindows())
 			{
 				return GetWindowsTheme();
 			}

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Input/GtkKeyboardInputSource.cs b/src/Uno.UI.Runtime.Skia.Gtk/Input/GtkKeyboardInputSource.cs
@@ -100,7 +100,7 @@ private void OnKeyReleaseEvent(EventKey evt)
 
 	private static char? KeyCodeToUnicode(uint keyCode, uint keyVal)
 	{
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+		if (OperatingSystem.IsWindows())
 		{
 			var result = InputHelper.WindowsKeyCodeToUnicode(keyCode);
 			return result.Length > 0 ? result[0] : null; // TODO: supplementary code points

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Rendering/OpenGLESRenderSurface.cs b/src/Uno.UI.Runtime.Skia.Gtk/Rendering/OpenGLESRenderSurface.cs
@@ -42,10 +42,10 @@ public static bool IsSupported
 			get
 			{
 				// OpenGL support on macOS is currently broken
-				var isMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+				var isMacOS = OperatingSystem.IsMacOS();
 
 				// WSL2 is not supported because of a low version for GLSL (https://github.com/unoplatform/uno/issues/8643#issuecomment-1114392827)
-				var isWSL2 = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+				var isWSL2 = OperatingSystem.IsLinux()
 					// https://github.com/microsoft/WSL/issues/423#issuecomment-844418910
 					&& File.Exists("/proc/sys/kernel/osrelease")
 					&& File.ReadAllText("/proc/sys/kernel/osrelease").Trim().EndsWith("WSL2", StringComparison.Ordinal);

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Rendering/OpenGLRenderSurface.cs b/src/Uno.UI.Runtime.Skia.Gtk/Rendering/OpenGLRenderSurface.cs
@@ -31,7 +31,7 @@ public static bool IsSupported
 			get
 			{
 				// OpenGL support on macOS is currently broken
-				var isMacOs = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+				var isMacOs = OperatingSystem.IsMacOS();
 
 				try
 				{

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Rendering/SoftwareRenderSurface.cs b/src/Uno.UI.Runtime.Skia.Gtk/Rendering/SoftwareRenderSurface.cs
@@ -1,17 +1,17 @@
 #nullable enable
 
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using Cairo;
-using SkiaSharp;
+using Gtk;
+using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml.Input;
-using WUX = Microsoft.UI.Xaml;
+using SkiaSharp;
 using Uno.Foundation.Logging;
-using System.Diagnostics;
-using Windows.Graphics.Display;
-using Gtk;
 using Uno.UI.Hosting;
-using Microsoft.UI.Composition;
+using Windows.Graphics.Display;
 
 namespace Uno.UI.Runtime.Skia.Gtk;
 
@@ -40,7 +40,7 @@ public SoftwareRenderSurface(IXamlRootHost host)
 
 		_colorType = SKImageInfo.PlatformColorType;
 		// R and B channels are inverted on macOS running on arm64 CPU and this is not detected by Skia
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+		if (OperatingSystem.IsMacOS())
 		{
 			if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
 			{

diff --git a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/ProgressBar/ProgressBarTest.cs b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/ProgressBar/ProgressBarTest.cs
@@ -20,7 +20,7 @@ public class ProgressBarTest
 	[TestMethod]
 	public async Task ProgressBarLayoutUpdate()
 	{
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+		if (OperatingSystem.IsMacOS())
 		{
 			Assert.Inconclusive("This test is not valid on macOS");
 			return;

diff --git a/src/Uno.UI/Helpers/InputHelper.cs b/src/Uno.UI/Helpers/InputHelper.cs
@@ -45,7 +45,7 @@ private static string InputToUnicode(uint keyCode, uint scanCode)
 
 	public static bool TryConvertKeyCodeToScanCode(uint keyCode, out uint scanCode)
 	{
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+		if (OperatingSystem.IsWindows())
 		{
 			scanCode = MapVirtualKey(keyCode, 0);
 			return true;

diff --git a/src/Uno.UWP/Storage/ApplicationData.skia.cs b/src/Uno.UWP/Storage/ApplicationData.skia.cs
@@ -107,7 +107,7 @@ private string GetLocalCacheFolderRootPath()
 			return path;
 		}
 
-		string? localCacheRootFolder = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ?
+		string? localCacheRootFolder = OperatingSystem.IsLinux() ?
 			Environment.GetEnvironmentVariable("XDG_CACHE_HOME") :
 			Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
 

diff --git a/src/Uno.UWPSyncGenerator/Helpers/ProcessHelper.cs b/src/Uno.UWPSyncGenerator/Helpers/ProcessHelper.cs
@@ -15,7 +15,7 @@ internal class ProcessHelper
 	{
 		public static (int exitCode, string output, string error) RunProcess(string executable, string parameters, string? workingDirectory = null)
 		{
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+			if (!OperatingSystem.IsWindows()
 				&& executable.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
 			{
 				executable = Path.GetFileNameWithoutExtension(executable);