Simplify the OS checks

Author: kevinchalet

Directory.Build.targets

@@ -69,7 +69,6 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_NAMED_PIPE_STATIC_FACTORY_WITH_ACL</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_HASHING_METHODS</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_KEY_DERIVATION_METHODS</DefineConstants>
-    <DefineConstants>$(DefineConstants);SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_PEM_ENCODED_KEY_IMPORT</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_REDIRECTION_ON_SIGN_IN</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_TEXT_ELEMENT_ENUMERATOR</DefineConstants>

src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationConfiguration.cs

@@ -62,12 +62,9 @@ public void PostConfigure(string? name, OpenIddictClientSystemIntegrationOptions
         ArgumentNullException.ThrowIfNull(options);
 
         // Ensure the operating system version is supported.
-        if ((OperatingSystem.IsAndroid()     && !OperatingSystem.IsAndroidVersionAtLeast(21))        ||
-            (OperatingSystem.IsIOS()         && !OperatingSystem.IsIOSVersionAtLeast(12))            ||
-             OperatingSystem.IsLinux()                                                               ||
-            (OperatingSystem.IsMacCatalyst() && !OperatingSystem.IsMacCatalystVersionAtLeast(13, 1)) ||
-            (OperatingSystem.IsMacOS()       && !OperatingSystem.IsMacOSVersionAtLeast(10, 15))      ||
-            (OperatingSystem.IsWindows()     && !OperatingSystem.IsWindowsVersionAtLeast(7)))
+        if (!OperatingSystem.IsAndroidVersionAtLeast(21)    && !OperatingSystem.IsIOSVersionAtLeast(12)            &&
+            !OperatingSystem.IsLinux()                      && !OperatingSystem.IsMacCatalystVersionAtLeast(13, 1) &&
+            !OperatingSystem.IsMacOSVersionAtLeast(10, 15)  && !OperatingSystem.IsWindowsVersionAtLeast(7))
         {
             throw new PlatformNotSupportedException(SR.GetResourceString(SR.ID0389));
         }

src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationExtensions.cs

@@ -28,12 +28,9 @@ public static OpenIddictClientSystemIntegrationBuilder UseSystemIntegration(this
         ArgumentNullException.ThrowIfNull(builder);
 
         // Ensure the operating system version is supported.
-        if ((OperatingSystem.IsAndroid()     && !OperatingSystem.IsAndroidVersionAtLeast(21))        ||
-            (OperatingSystem.IsIOS()         && !OperatingSystem.IsIOSVersionAtLeast(12))            ||
-             OperatingSystem.IsLinux()                                                               ||
-            (OperatingSystem.IsMacCatalyst() && !OperatingSystem.IsMacCatalystVersionAtLeast(13, 1)) ||
-            (OperatingSystem.IsMacOS()       && !OperatingSystem.IsMacOSVersionAtLeast(10, 15))      ||
-            (OperatingSystem.IsWindows()     && !OperatingSystem.IsWindowsVersionAtLeast(7)))
+        if (!OperatingSystem.IsAndroidVersionAtLeast(21)    && !OperatingSystem.IsIOSVersionAtLeast(12)            &&
+            !OperatingSystem.IsLinux()                      && !OperatingSystem.IsMacCatalystVersionAtLeast(13, 1) &&
+            !OperatingSystem.IsMacOSVersionAtLeast(10, 15)  && !OperatingSystem.IsWindowsVersionAtLeast(7))
         {
             throw new PlatformNotSupportedException(SR.GetResourceString(SR.ID0389));
         }

src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs

@@ -77,7 +77,7 @@ public static class OpenIddictClientSystemIntegrationHelpers
     [SupportedOSPlatformGuard("maccatalyst13.1")]
     [SupportedOSPlatformGuard("macos10.15")]
     internal static bool IsASWebAuthenticationSessionSupported()
-#if SUPPORTS_AUTHENTICATION_SERVICES && SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON
+#if SUPPORTS_AUTHENTICATION_SERVICES
         => OperatingSystem.IsIOSVersionAtLeast(12)         ||
            OperatingSystem.IsMacCatalystVersionAtLeast(13) ||
            OperatingSystem.IsMacOSVersionAtLeast(10, 15);
@@ -92,7 +92,7 @@ internal static bool IsASWebAuthenticationSessionSupported()
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [SupportedOSPlatformGuard("android21.0")]
     internal static bool IsCustomTabsIntentSupported()
-#if SUPPORTS_ANDROIDX_BROWSER && SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON
+#if SUPPORTS_ANDROIDX_BROWSER
         => OperatingSystem.IsAndroidVersionAtLeast(21);
 #else
         => false;