Merge pull request #2299 from unoplatform/dev/nr/versionbump52

fix: MessageDialog not working
unoplatform · Jun 12, 2024 · 4625293 · 4625293
2 parents 74a945f + ee4627c
commit 4625293
Show file tree

Hide file tree

Showing 32 changed files with 192 additions and 117 deletions.
diff --git a/doc/Learn/Maui/MauiOverview.md b/doc/Learn/Maui/MauiOverview.md
@@ -87,8 +87,8 @@ Add a reference in the existing class library to [Uno.Extensions.Maui.WinUI](htt
     <Project ToolsVersion="15.0">
       <ItemGroup>
         ...
-        <!--<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" /> -->
-        <!-- <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />-->
+        <!--<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" /> -->
+        <!-- <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />-->
         ...
         <!--<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />-->
         ...

diff --git a/samples/MauiEmbedding/Directory.Build.props b/samples/MauiEmbedding/Directory.Build.props
@@ -20,6 +20,7 @@
 		<IsMacCatalyst>false</IsMacCatalyst>
 		<IsWinAppSdk>false</IsWinAppSdk>
 		<_UseTelerik>false</_UseTelerik>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 	</PropertyGroup>
 
 	<Choose>

diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props
@@ -2,18 +2,23 @@
 	<ItemGroup>
 		<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+		<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3"/>
+		<PackageVersion Include="Microsoft.Maui.Controls.Compatibility"  Version="8.0.3"/>
 		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
 		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" />
 		<PackageVersion Include="SkiaSharp" Version="2.88.8" />
 		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.8" />
 		<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.8" />
 		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.8" />
+		<PackageVersion Include="Syncfusion.Maui.Core" Version="22.2.9" />
+		<PackageVersion Include="Syncfusion.Maui.Charts" Version="22.2.9" />
+		<PackageVersion Include="Syncfusion.Maui.DataGrid" Version="22.2.9" />
 		<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 		<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
-		<PackageVersion Include="Uno.Material.WinUI" Version="4.0.4" />
+		<PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
 		<PackageVersion Include="Uno.Dsp.Tasks" Version="1.2.7" />
-		<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.15" />
-		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.15" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.24" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />
 		<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
 		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
 		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -25,7 +30,7 @@
 		<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
 		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
 		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.13" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.13" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.16" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.16" />
 	</ItemGroup>
 </Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding.MauiControls/MauiEmbedding.MauiControls.csproj b/samples/MauiEmbedding/MauiEmbedding.MauiControls/MauiEmbedding.MauiControls.csproj
@@ -13,6 +13,8 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+
+		<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props
@@ -17,28 +17,28 @@
 		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
 		<PackageVersion Include="Refit" Version="6.3.2" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />
-		<PackageVersion Include="SkiaSharp.Views" Version="2.88.6" />
-		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
-		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
+		<PackageVersion Include="SkiaSharp.Views" Version="2.88.7" />
+		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
+		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
 		<PackageVersion Include="System.Text.Json" Version="8.0.1" />
 		<PackageVersion Include="Uno.Core" Version="4.0.1" />
 		<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 		<PackageVersion Include="Uno.Extensions.Logging.OSLog " Version="1.7.0" />
 		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-		<PackageVersion Include="Uno.Material" Version="4.0.4" />
-		<PackageVersion Include="Uno.Material.WinUI" Version="4.0.4" />
-		<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.15" />
-		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.15" />
-		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
+		<PackageVersion Include="Uno.Material" Version="5.0.13" />
+		<PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.24" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.132" />
 		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.7" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.7" />
-		<PackageVersion Include="Uno.WinUI" Version="5.0.19" />
-		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
-		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
-		<PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.19" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.16" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.16" />
+		<PackageVersion Include="Uno.WinUI" Version="5.2.132" />
+		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.2.132" />
+		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.2.132" />
+		<PackageVersion Include="Uno.WinUI.DevServer" Version="5.2.132" />
 		<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
-		<PackageVersion Include="Uno.WinUI.Lottie" Version="5.0.19" />
+		<PackageVersion Include="Uno.WinUI.Lottie" Version="5.2.132" />
 		<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.3"/>
 	</ItemGroup>
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -86,7 +86,7 @@
 		<WriteLinesToFile File="$(_AndroidResourceDesignerFile)" Lines="// Empty Content from uno.ui Directory.Build.targets." />
 	</Target>
 
-	<Import Project="winappsdk-workaround.targets" Condition="exists('winappsdk-workaround.targets')" />
+	<Import Project="winappsdk-workaround.targets" Condition="exists('winappsdk-workaround.targets') and $(TargetFramework.Contains('windows10'))" />
 	<Import Project="xamarinmac-workaround.targets" Condition="exists('xamarinmac-workaround.targets') and $(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac'))" />
 	<Import Project="Directory.UnoMetadata.targets" />
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -6,7 +6,7 @@
 	<PropertyGroup Condition="$(SolutionName) != 'MauiEmbedding'">
 		<UnoVersion Condition="$(UnoVersion) == '' AND !$(MSBuildProjectName.Contains('Maui'))">5.0.19</UnoVersion>
 		<UnoVersion Condition="$(UnoVersion) == '' AND $(MSBuildProjectName.Contains('Maui'))">5.2.22</UnoVersion>
-		<WinAppSdkVersion Condition="$(WinAppSdkVersion) == ''">1.4.231219000</WinAppSdkVersion>
+		<WinAppSdkVersion Condition="$(WinAppSdkVersion) == ''">1.5.240311000</WinAppSdkVersion>
 	</PropertyGroup>
 
 	<Import Project="$(MSBuildThisFileDirectory)maui-embedding.props" Condition="$(SolutionName) == 'MauiEmbedding'" />
@@ -25,15 +25,15 @@
 		<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.1" />
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageVersion Include="Microsoft.Identity.Client" Version="4.60.3" />
-		<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.22.0" />
+		<PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
+		<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
 		<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
 		<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
 		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
 		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 		<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
-		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
 		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" />
 		<PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.2.0" />
 		<PackageVersion Include="Moq" Version="4.17.2" />
@@ -53,8 +53,8 @@
 		<PackageVersion Include="Uno.Core" Version="4.0.1" />
 		<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
 		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-		<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.2.0-dev.58" />
-		<PackageVersion Include="Uno.Extensions.Markup.WinUI" Version="5.2.0-dev.58" />
+		<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.2.14" />
+		<PackageVersion Include="Uno.Extensions.Markup.WinUI" Version="5.2.14" />
 		<PackageVersion Include="Uno.Roslyn" Version="1.3.0-dev.12" />
 		<PackageVersion Include="Uno.Toolkit" Version="5.0.15" />
 		<PackageVersion Include="Uno.Toolkit.UI" Version="5.0.15" />
@@ -65,7 +65,7 @@
 		<PackageVersion Include="Uno.UI.Runtime.WebAssembly" Version="$(UnoVersion)" />
 		<PackageVersion Include="Uno.UI.RuntimeTests.Engine" Version="0.24.0-dev.95" />
 		<PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
-		<PackageVersion Include="Uno.WinUI.Markup" Version="5.2.0-dev.58" />
+		<PackageVersion Include="Uno.WinUI.Markup" Version="5.2.14" />
 		<PackageVersion Include="Uno.WinUI.MSAL" Version="$(UnoVersion)" />
 		<PackageVersion Include="Uno.WinUI.Runtime.WebAssembly" Version="$(UnoVersion)" />
 		<PackageVersion Include="coverlet.collector" Version="3.1.2" />

diff --git a/src/Uno.Extensions.Authentication.MSAL/GlobalUsings.cs b/src/Uno.Extensions.Authentication.MSAL/GlobalUsings.cs
@@ -9,12 +9,16 @@
 global using System.Threading.Tasks;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
+#if UNO_EXT_MSAL
 global using Microsoft.Identity.Client;
 global using Microsoft.Identity.Client.Extensions.Msal;
+#endif
 global using Uno.Extensions.Authentication;
 global using Uno.Extensions.Authentication.MSAL;
 global using Uno.Extensions.Configuration;
 global using Uno.Extensions.Hosting;
 global using Uno.Extensions.Storage;
+#if UNO_EXT_MSAL
 global using Uno.UI.MSAL;
+#endif
 global using Windows.Security.Authentication.Web;
diff --git a/src/Uno.Extensions.Authentication.MSAL/HostBuilderExtensions.cs b/src/Uno.Extensions.Authentication.MSAL/HostBuilderExtensions.cs
@@ -26,6 +26,9 @@ public static IAuthenticationBuilder AddMsal(
 		Action<IMsalAuthenticationBuilder>? configure = default,
 		string name = MsalAuthenticationProvider.DefaultName)
 	{
+#if !UNO_EXT_MSAL
+		return builder;
+#else
 		var hostBuilder = (builder as IBuilder)?.HostBuilder;
 		if (hostBuilder is null)
 		{
@@ -53,6 +56,6 @@ public static IAuthenticationBuilder AddMsal(
 					provider.Build();
 					return provider;
 				});
+#endif
 	}
-
 }
diff --git a/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationBuilderExtensions.cs b/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationBuilderExtensions.cs
@@ -5,6 +5,8 @@
 /// </summary>
 public static class MsalAuthenticationBuilderExtensions
 {
+#if UNO_EXT_MSAL
+
 	/// <summary>
 	/// Configures the MSAL authentication feature to use a public client application builder.
 	/// </summary>
@@ -60,6 +62,7 @@ Action<StorageCreationPropertiesBuilder> store
 
 		return builder;
 	}
+#endif
 
 	/// <summary>
 	/// Configures the MSAL authentication feature to be built with the specified scopes for authentication.
@@ -89,6 +92,7 @@ string[] scopes
 		return builder;
 	}
 
+#if UNO_EXT_MSAL
 	/// <summary>
 	/// Configures a public client application builder to create the MSAL authentication 
 	/// feature to use the redirect Uri provided by WebAuthenticationBroker.
@@ -104,4 +108,5 @@ public static PublicClientApplicationBuilder WithWebRedirectUri(this PublicClien
 	{
 		return builder.WithRedirectUri(WebAuthenticationBroker.GetCurrentApplicationCallbackUri().OriginalString);
 	}
+#endif
 }
diff --git a/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs b/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs
@@ -1,11 +1,13 @@
 
 using Uno.Extensions.Logging;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
+#if UNO_EXT_MSAL
 #if __WASM__
 using MsalCacheHelper = Microsoft.Identity.Client.Extensions.Msal.Wasm.MsalCacheHelper;
 #else
 using MsalCacheHelper = Microsoft.Identity.Client.Extensions.Msal.MsalCacheHelper;
 #endif
+#endif
 
 namespace Uno.Extensions.Authentication.MSAL;
 
@@ -17,6 +19,7 @@ internal record MsalAuthenticationProvider(
 		MsalAuthenticationSettings? Settings = null) : BaseAuthenticationProvider(ProviderLogger, DefaultName, Tokens)
 {
 	public const string DefaultName = "Msal";
+#if UNO_EXT_MSAL
 	private const string CacheFileName = "msal.cache";
 
 	private IPublicClientApplication? _pca;
@@ -253,6 +256,5 @@ private ValueTask<AuthenticationResult> AcquireInteractiveTokenAsync(IDispatcher
 
 		return default;
 	}
+#endif
 }
-
-
diff --git a/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationSettings.cs b/src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationSettings.cs
@@ -4,9 +4,10 @@ namespace Uno.Extensions.Authentication.MSAL;
 
 internal record MsalAuthenticationSettings
 {
+#if UNO_EXT_MSAL
 	public Action<PublicClientApplicationBuilder>? Build { get; init; }
 
 	public Action<StorageCreationPropertiesBuilder>? Store { get; init; }
-
+#endif
 	public string[]? Scopes { get; init; }
 }
diff --git a/src/Uno.Extensions.Authentication.MSAL/MsalConfiguration.cs b/src/Uno.Extensions.Authentication.MSAL/MsalConfiguration.cs
@@ -1,6 +1,9 @@
 namespace Uno.Extensions.Authentication.MSAL;
 
-internal class MsalConfiguration : PublicClientApplicationOptions
+internal class MsalConfiguration
+#if UNO_EXT_MSAL
+	: PublicClientApplicationOptions
+#endif
 {
 	public string[]? Scopes { get; init; }
 }
diff --git a/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.UI.csproj b/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.UI.csproj
@@ -29,7 +29,7 @@
 		<TargetPlatformMinVersion>14.2</TargetPlatformMinVersion>
 		<TargetPlatformVersion>15.4</TargetPlatformVersion>
 	</PropertyGroup>
-	
+
 	<Import Project="common.props" />
 
 	<PropertyGroup>
@@ -38,7 +38,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Uno.UI" />
-		<PackageReference Include="Uno.UI.MSAL" />
+		<!-- MSAL isn't supported on skia targets, macos or maccatalyst -->
+		<PackageReference Include="Uno.UI.MSAL" Condition="'$(IsMSALSupported)'=='true'" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.WinUI.csproj b/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.WinUI.csproj
@@ -50,10 +50,8 @@
 
 	<ItemGroup >
 		<PackageReference Include="Uno.WinUI" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Uno.WinUI.MSAL" />
+		<!-- MSAL isn't supported on skia targets, macos or maccatalyst -->
+		<PackageReference Include="Uno.WinUI.MSAL" Condition="'$(IsMSALSupported)'=='true'" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.Extensions.Authentication.MSAL/build/Package.targets b/src/Uno.Extensions.Authentication.MSAL/build/Package.targets
@@ -3,6 +3,11 @@
 		<Using Include="Uno.Extensions.Authentication.MSAL" />
 	</ItemGroup>
 
+	<PropertyGroup Condition="'$(_IsNetStd)'!='true' and '$(_IsMacOS)'!='true' and '$(_IsCatalyst)'!='true'" >
+		<IsMSALSupported>true</IsMSALSupported>
+		<DefineConstants>$(DefineConstants);UNO_EXT_MSAL</DefineConstants>
+	</PropertyGroup>
+
 	<!--
   This is a temporary workaround to avoid error "NETSDK1152: Found multiple publish output files with the same relative path:"
   for Microsoft.Web.WebView2.Core.dll, with one coming from MsixContent and the other from the Microsoft.Web.Webview2 Nuget package.

diff --git a/src/Uno.Extensions.Authentication.MSAL/common.props b/src/Uno.Extensions.Authentication.MSAL/common.props
@@ -2,6 +2,12 @@
 	<PropertyGroup>
 		<!--Temporary disable missing XML doc until fixed in the whole package-->
 		<WarningsNotAsErrors>$(WarningsNotAsErrors);CS1591</WarningsNotAsErrors>
+		<IsMSALSupported>false</IsMSALSupported>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(_IsNetStd)'!='true' and '$(_IsMacOS)'!='true' and '$(_IsCatalyst)'!='true'" >
+		<IsMSALSupported>true</IsMSALSupported>
+		<DefineConstants>$(DefineConstants);UNO_EXT_MSAL</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -17,8 +23,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" />
-		<PackageReference Include="Microsoft.Identity.Client" />
-		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" />
+		<PackageReference Include="Microsoft.Identity.Client" Condition="'$(IsMSALSupported)'=='true'" />
+		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Condition="'$(IsMSALSupported)'=='true'" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.Extensions.Navigation.UI/Navigators/MessageDialogNavigator.cs b/src/Uno.Extensions.Navigation.UI/Navigators/MessageDialogNavigator.cs
@@ -95,7 +95,7 @@ buttonValues is DialogAction[] butVals &&
 		};
 		md.Commands.AddRange(commands);
 
-#if WINUI && WINDOWS
+#if WINUI || HAS_UNO_WINUI
 		var window = Window!;
 		var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(window);
 		WinRT.Interop.InitializeWithWindow.Initialize(md, hwnd);

diff --git a/...RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj b/...RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj
@@ -30,16 +30,16 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
-		<PackageReference Include="Uno.WinUI" Version="5.0.19" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
+		<PackageReference Include="Uno.WinUI" Version="5.2.132" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.2.132" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.132" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
+		<PackageReference Include="Uno.WinUI.Lottie" Version="5.2.132" />
 	</ItemGroup>
 	<Choose>
 		<When Condition="'$(TargetFramework)'=='net8.0-android'">
 			<ItemGroup>
-				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
+				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.5.0.13" />
 				<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
 			</ItemGroup>
 			<ItemGroup>

diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Shared/App.xaml.cs b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Shared/App.xaml.cs
@@ -50,8 +50,8 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
 #endif
 
 			ForceAssemblyLoading();
-			_window.Content ??= new Uno.UI.RuntimeTests.UnitTestsControl();
-			_window.Activate();
+			_window!.Content ??= new Uno.UI.RuntimeTests.UnitTestsControl();
+			_window!.Activate();
 		}
 
 		/// <summary>