Merge pull request #2817 from unoplatform/mergify/bp/release/stable/6.0/pr-2816

Author: kazo0

src/Directory.Build.props

@@ -173,13 +173,18 @@
 
 	<Target Name="__RemoveUnoRuntimeWasm"
 			AfterTargets="UnoImplicitPackages">
+		<ItemGroup Condition="'$(IsUnoHead)' != 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm'">
 		<!--
 		Disable explicit references to Uno.WinUI.Runtime.WebAssembly in order to avoid using JSInvoke directly
 		This change is done manually here to avoid 
 		-->
-		<ItemGroup>
-			<PackageReference Remove="Uno.WinUI.Runtime.WebAssembly"
-							  Condition="'$(IsUnoHead)' != 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm'" />
+			<PackageReference Remove="Uno.WinUI.Runtime.WebAssembly" />
+
+			<!--
+				We also remove the Uno.WinUI.WebAssembly package reference, as it is not needed in this case and will break the skia renderer
+				https://github.com/unoplatform/uno/issues/20792
+			-->
+			<PackageReference Remove="Uno.WinUI.WebAssembly" />
 		</ItemGroup>
 	</Target>
 

src/Uno.Extensions.Authentication.MSAL/MsalAuthenticationProvider.cs

@@ -4,12 +4,8 @@
 using Uno.Extensions.Logging;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 #if UNO_EXT_MSAL
-#if BROWSERWASM1_0_OR_GREATER
-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;
 
@@ -193,11 +189,7 @@ private async Task SetupStorage()
 			var builder = new StorageCreationPropertiesBuilder(CacheFileName, folderPath);
 			Settings?.Store?.Invoke(builder);
 			var storage = builder.Build();
-#if BROWSERWASM1_0_OR_GREATER
-			var cacheHelper = await MsalCacheHelper.CreateAsync(Logger, storage);
-#else
 			var cacheHelper = await MsalCacheHelper.CreateAsync(storage);
-#endif
 			cacheHelper.RegisterCache(_pca!.UserTokenCache);
 			if (Logger.IsEnabled(LogLevel.Trace))
 			{