From 807bc7ff20a0bb219c510e045da46a85e9150b57 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Tue, 14 Jan 2025 08:17:43 -0500
Subject: [PATCH] fix: Use browser logger on Wasm browser

---
 .../HostBuilderExtensions.cs                     | 16 +++++++++++-----
 .../Uno.Extensions.Logging.WinUI.csproj          |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Uno.Extensions.Logging/HostBuilderExtensions.cs b/src/Uno.Extensions.Logging/HostBuilderExtensions.cs
index 42ccb21a2d..d27d331180 100644
--- a/src/Uno.Extensions.Logging/HostBuilderExtensions.cs
+++ b/src/Uno.Extensions.Logging/HostBuilderExtensions.cs
@@ -53,18 +53,24 @@ public static IHostBuilder UseLogging(
 				{
 					if (!context.IsRegistered(nameof(UseLogging)))
 					{
-#if !__WASM__
 #if __IOS__
 #pragma warning disable CA1416 // Validate platform compatibility: The net8.0 version is not used on older versions of OS
 						builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider());
 #pragma warning restore CA1416 // Validate platform compatibility
 #elif NET6_0_OR_GREATER || __SKIA__ // Console isn't supported on all Xamarin targets, so only adding for net8.0 and above
-						builder.AddConsole();
+
+						if (OperatingSystem.IsBrowser())
+						{
+#if !__IOS__ && !__ANDROID__ && !__SKIA__ && !__WINDOWS__ && !DESKTOP1_0_OR_GREATER
+							builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
 #endif
-						builder.AddDebug();
-#elif __WASM__
-						builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
+						}
+						else
+						{
+							builder.AddConsole();
+						}
 #endif
+							builder.AddDebug();
 					}
 
 					configure?.Invoke(context, builder);
diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
index c7a25fd96a..2e67cd3b92 100644
--- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
+++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
@@ -30,7 +30,7 @@
 		<ProjectReference Include="..\Uno.Extensions.Hosting\Uno.Extensions.Hosting.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(IsBrowserWasm)'=='true'">
+	<ItemGroup Condition="'$(IsBrowserWasm)'=='true' or '$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
 	</ItemGroup>
 </Project>