Fix macOS detection to include maccatalyst target in desktop platform checks (#5882)

* Update DesktopOsHelper.cs

* Update DesktopOsHelper.cs

* Update nativeinterop to 0.20.4

Author: ashok672

Directory.Packages.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <!-- Version of the Microsoft.Identity.Client.NativeInterop package. -->
-    <MSALRuntimeNativeInteropVersion>0.20.3</MSALRuntimeNativeInteropVersion>
+    <MSALRuntimeNativeInteropVersion>0.20.4</MSALRuntimeNativeInteropVersion>
     <!-- Version of MSAL if not defined by the CI-->
     <MsalInternalVersion>4.61.0</MsalInternalVersion>
     <!-- Version of Microsoft.Identity.Lab.Api if not defined by the CI-->

src/client/Microsoft.Identity.Client/PlatformsCommon/Shared/DesktopOsHelper.cs

@@ -52,9 +52,10 @@ public static bool IsMac()
 #elif NETFRAMEWORK
             return Environment.OSVersion.Platform == PlatformID.MacOSX;
 #elif NET8_0_OR_GREATER
-            return OperatingSystem.IsMacOS();
+            return OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst();
 #else
-            return RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+            return RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ||
+                RuntimeInformation.OSDescription.IndexOf("Darwin", StringComparison.OrdinalIgnoreCase) >= 0;
 #endif
         }
 

tests/devapps/MacConsoleAppWithBroker/MacConsoleAppWithBroker.csproj

@@ -19,7 +19,7 @@
       <TargetPath>msalruntime_arm64.dylib</TargetPath>
     </None> -->
 
-		<PackageReference Include="Microsoft.Identity.Client.NativeInterop" Version="0.20.3" />
+    <PackageReference Include="Microsoft.Identity.Client.NativeInterop" Version="0.20.4" />
 
 	</ItemGroup>
 

tests/devapps/MacMauiAppWithBroker/MacMauiAppWithBroker.csproj

@@ -89,7 +89,7 @@
     </ItemGroup> -->
 
 	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-		<PackageReference Include="Microsoft.Identity.Client.NativeInterop" Version="0.20.3" />
+		<PackageReference Include="Microsoft.Identity.Client.NativeInterop" Version="0.20.4" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">