fix: Exception when logging on Xamarin targets

unoplatform · Dec 7, 2022 · f939512 · f939512
1 parent fccfa38
commit f939512
Show file tree

Hide file tree

Showing 20 changed files with 228 additions and 26 deletions.
diff --git a/src/Uno.Extensions.Logging/HostBuilderExtensions.cs b/src/Uno.Extensions.Logging/HostBuilderExtensions.cs
@@ -23,12 +23,12 @@ public static IHostBuilder UseLogging(
 #pragma warning disable CA1416 // Validate platform compatibility: The net6.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
-#else
+#elif NET6_0_OR_GREATER // Console isn't supported on all Xamarin targets, so only adding for net6.0 and above
 					builder.AddConsole();
 #endif
 					builder.AddDebug();
-#elif __WASM__         
-                        builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
+#elif __WASM__
+					builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
 #endif
 					configure?.Invoke(context, builder);
 				})

diff --git a/testing/TestHarness/Directory.Build.props b/testing/TestHarness/Directory.Build.props
@@ -63,6 +63,6 @@
 	<PropertyGroup Condition="'$(_IsIOS)' == 'true'">
 		<MtouchExtraArgs>$(MtouchExtraArgs) --registrar=static</MtouchExtraArgs>
 	</PropertyGroup>
-
-	<Import Project="..\src\crosstargeting_override.props" Condition="exists('..\src\crosstargeting_override.props')" />
+	
+	<Import Project="$(MSBuildThisFileDirectory)..\..\src\crosstargeting_override.props" Condition="exists('$(MSBuildThisFileDirectory)..\..\src\crosstargeting_override.props')" />
 </Project>
diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props
@@ -24,6 +24,7 @@
 		<PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
 		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.3" />
 		<PackageVersion Include="SkiaSharp.Views" Version="2.88.3" />
+		<PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.3" />
 		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
 		<PackageVersion Include="SkiaSharp.Views.WPF" Version="2.88.3" />
 		<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />

diff --git a/testing/TestHarness/TestHarness.Legacy.Droid/TestHarness.Legacy.Droid.csproj b/testing/TestHarness/TestHarness.Legacy.Droid/TestHarness.Legacy.Droid.csproj
@@ -70,7 +70,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm"  />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="IdentityModel.OidcClient" />
     <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" />
     <PackageReference Include="Microsoft.Identity.Client" />
@@ -81,12 +81,12 @@
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Refit" />
-    <PackageReference Include="Refit.HttpClientFactory"/>
+    <PackageReference Include="Refit.HttpClientFactory" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Uno.Material" />
-    <PackageReference Include="Uno.Toolkit.UI.Material"  />
-    <PackageReference Include="Uno.Toolkit.UI"/>
-    <PackageReference Include="Uno.UI.MSAL"  />
+    <PackageReference Include="Uno.Toolkit.UI.Material" />
+    <PackageReference Include="Uno.Toolkit.UI" />
+    <PackageReference Include="Uno.UI.MSAL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -156,6 +156,7 @@
     <ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
   </ItemGroup>
   <Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
+  <Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
   <Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Target Name="Issue3897Workaround" Condition=" '$(ManagedDesignTimeBuild)' == 'True' " AfterTargets="_RemoveLegacyDesigner">
@@ -164,4 +165,4 @@
       <Compile Remove="$(_AndroidResourceDesignerFile)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>
diff --git a/testing/TestHarness/TestHarness.Legacy.Skia.Gtk/TestHarness.Legacy.Skia.Gtk.csproj b/testing/TestHarness/TestHarness.Legacy.Skia.Gtk/TestHarness.Legacy.Skia.Gtk.csproj
@@ -63,5 +63,6 @@
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
+  	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 </Project>
diff --git a/...estHarness.Legacy.Skia.Linux.FrameBuffer/TestHarness.Legacy.Skia.Linux.FrameBuffer.csproj b/...estHarness.Legacy.Skia.Linux.FrameBuffer/TestHarness.Legacy.Skia.Linux.FrameBuffer.csproj
@@ -62,5 +62,6 @@
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 </Project>
diff --git a/testing/TestHarness/TestHarness.Legacy.Skia.Tizen/TestHarness.Legacy.Skia.Tizen.csproj b/testing/TestHarness/TestHarness.Legacy.Skia.Tizen/TestHarness.Legacy.Skia.Tizen.csproj
@@ -68,5 +68,6 @@
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 </Project>
diff --git a/testing/TestHarness/TestHarness.Legacy.Skia.WPF/TestHarness.Legacy.Skia.WPF.csproj b/testing/TestHarness/TestHarness.Legacy.Skia.WPF/TestHarness.Legacy.Skia.WPF.csproj
@@ -58,5 +58,6 @@
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 </Project>
diff --git a/testing/TestHarness/TestHarness.Legacy.UWP/TestHarness.Legacy.Uwp.csproj b/testing/TestHarness/TestHarness.Legacy.UWP/TestHarness.Legacy.Uwp.csproj
@@ -152,7 +152,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Refit" />
-    <PackageReference Include="Refit.HttpClientFactory"  />
+    <PackageReference Include="Refit.HttpClientFactory" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Uno.Material" />
     <PackageReference Include="Uno.Toolkit.UI.Material" />
@@ -198,6 +198,7 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
   <Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
 			 Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/testing/TestHarness/TestHarness.Legacy.Wasm/TestHarness.Legacy.Wasm.csproj b/testing/TestHarness/TestHarness.Legacy.Wasm/TestHarness.Legacy.Wasm.csproj
@@ -4,6 +4,7 @@
 		<TargetFramework>net5.0</TargetFramework>
 		<NoWarn>$(NoWarn);NU1701</NoWarn>
 		<AssemblyName>TestHarnessApp</AssemblyName>
+		<ImplicitUsings>disable</ImplicitUsings>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
 		<MonoRuntimeDebuggerEnabled>true</MonoRuntimeDebuggerEnabled>
@@ -91,5 +92,6 @@
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
-<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
+	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 </Project>
diff --git a/testing/TestHarness/TestHarness.Legacy.iOS/TestHarness.Legacy.iOS.csproj b/testing/TestHarness/TestHarness.Legacy.iOS/TestHarness.Legacy.iOS.csproj
@@ -117,18 +117,18 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="IdentityModel.OidcClient" />
-    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI"  />
-    <PackageReference Include="Microsoft.Identity.Client"  />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" />
+    <PackageReference Include="Microsoft.Identity.Client" />
     <PackageReference Include="Uno.UI" />
     <PackageReference Include="Uno.UI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.Extensions.Logging"   />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Refit" />
     <PackageReference Include="Refit.HttpClientFactory" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Uno.Material" />
-    <PackageReference Include="Uno.Toolkit.UI.Material"  />
+    <PackageReference Include="Uno.Toolkit.UI.Material" />
     <PackageReference Include="Uno.Toolkit.UI" />
     <PackageReference Include="Uno.UI.MSAL" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog" />
@@ -225,9 +225,10 @@
     <ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
   </ItemGroup>
   <Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
+  <Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
   <Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <PropertyGroup>
     <MtouchExtraArgs>$(MtouchExtraArgs) --registrar=static</MtouchExtraArgs>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/testing/TestHarness/TestHarness.Legacy.macOS/TestHarness.Legacy.macOS.csproj b/testing/TestHarness/TestHarness.Legacy.macOS/TestHarness.Legacy.macOS.csproj
@@ -70,20 +70,20 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="IdentityModel.OidcClient" />
-    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI"  />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" />
     <PackageReference Include="Microsoft.Identity.Client" />
     <PackageReference Include="Uno.UI" />
     <PackageReference Include="Uno.UI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Refit" />
-    <PackageReference Include="Refit.HttpClientFactory"  />
+    <PackageReference Include="Refit.HttpClientFactory" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Uno.Material" />
     <PackageReference Include="Uno.Toolkit.UI.Material" />
     <PackageReference Include="Uno.Toolkit.UI" />
-    <PackageReference Include="Uno.UI.MSAL"  />
+    <PackageReference Include="Uno.UI.MSAL" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Uno.Extensions.Authentication.Oidc\Uno.Extensions.Authentication.Oidc.UI.csproj" />
@@ -156,6 +156,7 @@
     </BundleResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+  <Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
   <Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
   <Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences">
     <!--

diff --git a/testing/TestHarness/TestHarness.Mobile/TestHarness.Mobile.csproj b/testing/TestHarness/TestHarness.Mobile/TestHarness.Mobile.csproj
@@ -112,7 +112,8 @@
 	<PropertyGroup Condition="'$(_IsIOS)' == 'true'">
 		<MtouchExtraArgs>$(MtouchExtraArgs) --registrar=static</MtouchExtraArgs>
 	</PropertyGroup>
-
+
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
 

diff --git a/testing/TestHarness/TestHarness.Shared/Ext/Core/Storage/StorageOneViewModel.cs b/testing/TestHarness/TestHarness.Shared/Ext/Core/Storage/StorageOneViewModel.cs
@@ -9,6 +9,7 @@ namespace TestHarness.Ext.Navigation.Storage;
 [ReactiveBindable(false)]
 public partial class StorageOneViewModel : ObservableObject
 {
+	private readonly Random _random = new Random();
 	private readonly INavigator _navigator;
 	private readonly IServiceProvider _services;
 	private readonly IEnumerable<INamedInstance<IKeyValueStorage>> _storage;
@@ -105,8 +106,8 @@ public async Task PerfTest()
 			var keyValues = new List<(string Key, string Value)>();
 			for (int i = 0; i < keyCount; i++)
 			{
-				var key = GenerateString(Random.Shared.Next(0, 100));
-				var value = GenerateString(Random.Shared.Next(0, 1000));
+				var key = GenerateString(_random.Next(0, 100));
+				var value = GenerateString(_random.Next(0, 1000));
 				keyValues.Add((key, value));
 			}
 
@@ -123,7 +124,7 @@ public async Task PerfTest()
 			var max = (5 * keyCount);
 			for (int i = 0; i < max; i++)
 			{
-				var key = Random.Shared.Next(0, keyCount);
+				var key = _random.Next(0, keyCount);
 				var val = await _selectedStorage.GetAsync<string>(keyValues[key].Key, CancellationToken.None);
 				if (i % 20 == 0)
 				{
@@ -149,7 +150,7 @@ public string GenerateString(int size)
 		char[] chars = new char[size];
 		for (int i = 0; i < size; i++)
 		{
-			chars[i] = Alphabet[Random.Shared.Next(Alphabet.Length)];
+			chars[i] = Alphabet[_random.Next(Alphabet.Length)];
 		}
 		return new string(chars);
 	}

diff --git a/testing/TestHarness/TestHarness.Shared/GlobalUsings.cs b/testing/TestHarness/TestHarness.Shared/GlobalUsings.cs
@@ -42,6 +42,7 @@
 	global using Window = Microsoft.UI.Xaml.Window;
 	global using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
 	global using Application = Microsoft.UI.Xaml.Application;
+	global using ToggleButton = Microsoft.UI.Xaml.Controls.Primitives.ToggleButton;
 #else
 	global using Windows.System;
 	global using Windows.UI.Xaml;
@@ -57,4 +58,5 @@
 	global using Window = Windows.UI.Xaml.Window;
 	global using LaunchActivatedEventArgs = Windows.ApplicationModel.Activation.LaunchActivatedEventArgs;
 	global using Application = Windows.UI.Xaml.Application;
+global using ToggleButton = Windows.UI.Xaml.Controls.Primitives.ToggleButton;
 #endif
diff --git a/testing/TestHarness/TestHarness.Skia.Gtk/TestHarness.Skia.Gtk.csproj b/testing/TestHarness/TestHarness.Skia.Gtk/TestHarness.Skia.Gtk.csproj
@@ -59,6 +59,7 @@
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Http.Refit\Uno.Extensions.Http.Refit.csproj" />
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
 

diff --git a/testing/TestHarness/TestHarness.Skia.WPF/TestHarness.Skia.WPF.csproj b/testing/TestHarness/TestHarness.Skia.WPF/TestHarness.Skia.WPF.csproj
@@ -53,6 +53,7 @@
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Http.Refit\Uno.Extensions.Http.Refit.csproj" />
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj b/testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj
@@ -93,6 +93,7 @@
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Storage\Uno.Extensions.Storage.csproj" />
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" Condition="Exists('..\TestHarness.Shared\TestHarness.Shared.projitems')" />
 </Project>
diff --git a/testing/TestHarness/TestHarness.Windows/TestHarness.Windows.csproj b/testing/TestHarness/TestHarness.Windows/TestHarness.Windows.csproj
@@ -94,6 +94,7 @@
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
 	</ItemGroup>
+	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 	<Import Project="..\..\..\src\Uno.Extensions.Reactive.Generator\buildTransitive\Uno.Extensions.Reactive.props" />
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" />
 </Project>