From aec8fdc61c38bc43464ae3c9f738ef5772d914d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Sun, 30 Jun 2024 00:02:24 +0200
Subject: [PATCH] Fix a bug preventing [SupportedOSPlatform] from being
 correctly set

---
 Directory.Build.props                                       | 4 ----
 Directory.Build.targets                                     | 6 ++++++
 .../OpenIddictClientSystemIntegrationHelpers.cs             | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b1467cd0..a5607ffa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -95,10 +95,6 @@
       Condition=" '$(UniversalWindowsPlatformTargetFrameworks)' == '' And '$(SupportsUniversalWindowsPlatformTargeting)' == 'true' ">
       uap10.0.17763
     </UniversalWindowsPlatformTargetFrameworks>
-
-    <SupportedOSPlatformVersion Condition=" '$(TargetPlatformIdentifier)' == 'iOS' ">12.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition=" '$(TargetPlatformIdentifier)' == 'Windows' ">7.0</SupportedOSPlatformVersion>
-    <TargetPlatformMinVersion   Condition=" '$(TargetPlatformIdentifier)' == 'Windows' ">7.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index f9fcb2a1..15e095fc 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -15,6 +15,12 @@
     <PublicSign>false</PublicSign>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <SupportedOSPlatformVersion Condition=" '$(TargetPlatformIdentifier)' == 'iOS' ">12.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition=" '$(TargetPlatformIdentifier)' == 'Windows' ">7.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion   Condition=" '$(TargetPlatformIdentifier)' == 'Windows' ">7.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
   <!--
     Note: .NET Framework and .NET Core <3.0/.NET Standard assemblies are not annotated
     with nullable references annotations. To avoid errors on these target frameworks,
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
index a3f0215c..6b687722 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
@@ -273,10 +273,12 @@ public static class OpenIddictClientSystemIntegrationHelpers
             {
                 try
                 {
+#pragma warning disable CA1416
                     using var scenes = UIApplication.SharedApplication.ConnectedScenes;
                     var scene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
 
                     return scene?.Windows.FirstOrDefault();
+#pragma warning restore CA1416
                 }
 
                 catch (InvalidCastException)
@@ -294,10 +296,12 @@ public static class OpenIddictClientSystemIntegrationHelpers
             {
                 try
                 {
+#pragma warning disable CA1416
                     using var scenes = UIApplication.SharedApplication.ConnectedScenes;
                     var scene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
 
                     return scene?.Windows;
+#pragma warning restore CA1416
                 }
 
                 catch (InvalidCastException)