From 82512048606c15e765c564f400eb4e5988f70af1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:10:41 +0000
Subject: [PATCH 01/12] Initial plan


From 8e6f3d6513cb1efa9dd83614e46de36f989b897e Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Wed, 28 Jan 2026 14:12:02 -0500
Subject: [PATCH 02/12] chore: Adjust restore

---
 build/workflow/copilot/restore-solution.sh | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/build/workflow/copilot/restore-solution.sh b/build/workflow/copilot/restore-solution.sh
index afd36b48c..9fd34658c 100644
--- a/build/workflow/copilot/restore-solution.sh
+++ b/build/workflow/copilot/restore-solution.sh
@@ -1,5 +1,29 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+# Create a desktop-only crosstargeting override for build pipelines
+cat > "src/crosstargeting_override.props" << 'EOF'
+<Project ToolsVersion="15.0">
+	<PropertyGroup>
+		<DisableMobileTargets>true</DisableMobileTargets>
+		<SamplesTargetFrameworkOverride>net10.0-desktop</SamplesTargetFrameworkOverride>
+		<TargetFrameworkOverride>net9.0</TargetFrameworkOverride>
+	</PropertyGroup>
+</Project>
+EOF
+
+cd src
+
+dotnet workload restore
+dotnet workload install android
+
 # Restore solution packages to ensure dependencies are ready for subsequent steps
-dotnet restore src/Uno.Toolkit.sln -p:SamplesTargetFrameworkOverride=net9.0-desktop -p:DisableMobileTargets=true
\ No newline at end of file
+dotnet restore Uno.Toolkit.sln
+
+# Preload the dev server tool
+dotnet dnx -y uno.devserver --prerelease -- start -l trace
+
+sleep 20
+
+dotnet dnx -y uno.devserver --prerelease -- stop -l trace
+

From 6ce9211221c0df9163e69fb7ed967d98d0fd3e1c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:22:33 +0000
Subject: [PATCH 03/12] feat: Add Settings page with version information
 display

Co-authored-by: jeromelaban <5839577+jeromelaban@users.noreply.github.com>
---
 .../App.xaml.Navigation.cs                    |   3 +-
 .../Content/SettingsPage.xaml                 | 108 ++++++++++++++++++
 .../Content/SettingsPage.xaml.cs              |  46 ++++++++
 3 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
index fd31250d4..54f2e17df 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
@@ -124,7 +124,8 @@ private void OnNavigationItemInvoked(MUXC.NavigationView sender, MUXC.Navigation
 		}
 		else if (e.IsSettingsInvoked)
 		{
-			_shell.ActivateDebugPanel();
+			var settingsPage = new Content.SettingsPage();
+			_shell.NavigationView.Content = settingsPage;
 		}
 	}
 
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
new file mode 100644
index 000000000..4556db7f8
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page x:Class="Uno.Toolkit.Samples.Content.SettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:local="using:Uno.Toolkit.Samples.Content"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<Grid>
+		<ScrollViewer>
+			<StackPanel Padding="48,24" Spacing="24" MaxWidth="600">
+				<!-- Header -->
+				<TextBlock Text="Settings"
+				           FontSize="32"
+				           FontWeight="Bold"
+				           Foreground="{ThemeResource OnBackgroundBrush}" />
+
+				<!-- App Information Section -->
+				<StackPanel Spacing="16">
+					<TextBlock Text="About"
+					           FontSize="20"
+					           FontWeight="SemiBold"
+					           Foreground="{ThemeResource OnBackgroundBrush}" />
+
+					<Border Background="{ThemeResource SurfaceBrush}"
+					        CornerRadius="8"
+					        Padding="16">
+						<StackPanel Spacing="12">
+							<!-- App Name -->
+							<StackPanel Spacing="4">
+								<TextBlock Text="Application"
+								           FontSize="14"
+								           Opacity="0.7"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+								<TextBlock Text="Uno Toolkit Samples"
+								           FontSize="16"
+								           FontWeight="SemiBold"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+							</StackPanel>
+
+							<!-- Version -->
+							<StackPanel Spacing="4">
+								<TextBlock Text="Version"
+								           FontSize="14"
+								           Opacity="0.7"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+								<TextBlock x:Name="VersionTextBlock"
+								           FontSize="16"
+								           FontWeight="SemiBold"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+							</StackPanel>
+
+							<!-- Framework -->
+							<StackPanel Spacing="4">
+								<TextBlock Text="Framework"
+								           FontSize="14"
+								           Opacity="0.7"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+								<TextBlock x:Name="FrameworkTextBlock"
+								           FontSize="16"
+								           FontWeight="SemiBold"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+							</StackPanel>
+
+							<!-- Platform -->
+							<StackPanel Spacing="4">
+								<TextBlock Text="Platform"
+								           FontSize="14"
+								           Opacity="0.7"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+								<TextBlock x:Name="PlatformTextBlock"
+								           FontSize="16"
+								           FontWeight="SemiBold"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+							</StackPanel>
+						</StackPanel>
+					</Border>
+				</StackPanel>
+
+				<!-- Additional Information -->
+				<StackPanel Spacing="16">
+					<TextBlock Text="Learn More"
+					           FontSize="20"
+					           FontWeight="SemiBold"
+					           Foreground="{ThemeResource OnBackgroundBrush}" />
+
+					<Border Background="{ThemeResource SurfaceBrush}"
+					        CornerRadius="8"
+					        Padding="16">
+						<StackPanel Spacing="12">
+							<HyperlinkButton Content="Uno Toolkit Documentation"
+							                 NavigateUri="https://platform.uno/docs/articles/external/uno.toolkit.ui/doc/getting-started.html"
+							                 Padding="0" />
+							<HyperlinkButton Content="GitHub Repository"
+							                 NavigateUri="https://github.com/unoplatform/uno.toolkit.ui"
+							                 Padding="0" />
+							<HyperlinkButton Content="Report an Issue"
+							                 NavigateUri="https://github.com/unoplatform/uno.toolkit.ui/issues"
+							                 Padding="0" />
+						</StackPanel>
+					</Border>
+				</StackPanel>
+			</StackPanel>
+		</ScrollViewer>
+	</Grid>
+</Page>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
new file mode 100644
index 000000000..d4422d565
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
@@ -0,0 +1,46 @@
+using System.Reflection;
+
+namespace Uno.Toolkit.Samples.Content
+{
+	public sealed partial class SettingsPage : Page
+	{
+		public SettingsPage()
+		{
+			this.InitializeComponent();
+			this.Loaded += OnLoaded;
+		}
+
+		private void OnLoaded(object sender, RoutedEventArgs e)
+		{
+			// Get version information
+			var assembly = Assembly.GetExecutingAssembly();
+			var assemblyName = assembly.GetName();
+			var version = assemblyName.Version;
+
+			// Set version text
+			VersionTextBlock.Text = version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : "Unknown";
+
+			// Set framework information
+			FrameworkTextBlock.Text = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
+
+			// Set platform information
+#if __ANDROID__
+			PlatformTextBlock.Text = "Android";
+#elif __IOS__
+			PlatformTextBlock.Text = "iOS";
+#elif __WASM__
+			PlatformTextBlock.Text = "WebAssembly";
+#elif __MACOS__
+			PlatformTextBlock.Text = "macOS";
+#elif __SKIA__
+			PlatformTextBlock.Text = "Skia (Desktop)";
+#elif WINDOWS_UWP
+			PlatformTextBlock.Text = "UWP";
+#elif WINDOWS
+			PlatformTextBlock.Text = "Windows (WinUI)";
+#else
+			PlatformTextBlock.Text = "Unknown";
+#endif
+		}
+	}
+}

From 68e8dcf7ec1afff6d75357dc60da2b44557166a6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:34:06 +0000
Subject: [PATCH 04/12] refactor: Cache SettingsPage instance and clear
 NavigationView selection

Co-authored-by: jeromelaban <5839577+jeromelaban@users.noreply.github.com>
---
 .../Uno.Toolkit.Samples/App.xaml.Navigation.cs           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
index 54f2e17df..127e3dfb2 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
@@ -10,6 +10,7 @@ partial class App
 {
 	private static Sample[] _samples;
 	private static IDictionary<string, Type> _nestedSampleMap;
+	private Content.SettingsPage _settingsPage;
 
 	/// <summary>
 	/// Invoked when Navigation to a certain page fails
@@ -124,8 +125,12 @@ private void OnNavigationItemInvoked(MUXC.NavigationView sender, MUXC.Navigation
 		}
 		else if (e.IsSettingsInvoked)
 		{
-			var settingsPage = new Content.SettingsPage();
-			_shell.NavigationView.Content = settingsPage;
+			// Cache the settings page to avoid recreating it each time
+			_settingsPage ??= new Content.SettingsPage();
+			
+			// Clear selected item to avoid having a sample highlighted while Settings is displayed
+			_shell.NavigationView.SelectedItem = null;
+			_shell.NavigationView.Content = _settingsPage;
 		}
 	}
 

From ea751ae6315c035913b46ebb1ace53e7890fdd3e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:36:12 +0000
Subject: [PATCH 05/12] fix: Remove duplicate using and move initialization to
 constructor

Co-authored-by: jeromelaban <5839577+jeromelaban@users.noreply.github.com>
---
 .../Uno.Toolkit.Samples/App.xaml.Navigation.cs            | 1 -
 .../Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs      | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
index 127e3dfb2..a45941510 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Reflection;
 using Uno.Extensions;
 
 using MUXC = Microsoft.UI.Xaml.Controls;
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
index d4422d565..43c88035a 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
@@ -7,12 +7,8 @@ public sealed partial class SettingsPage : Page
 		public SettingsPage()
 		{
 			this.InitializeComponent();
-			this.Loaded += OnLoaded;
-		}
-
-		private void OnLoaded(object sender, RoutedEventArgs e)
-		{
-			// Get version information
+			
+			// Initialize version information once since the page is cached
 			var assembly = Assembly.GetExecutingAssembly();
 			var assemblyName = assembly.GetName();
 			var version = assemblyName.Version;

From 21f3b9cc908ae489c1507a543d0a681a426b4599 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Wed, 28 Jan 2026 15:40:52 -0500
Subject: [PATCH 06/12] chore: Adjust samples app override

---
 .../Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj
index 5e0c93e1b..07419cc06 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj
@@ -1,4 +1,6 @@
 <Project Sdk="Uno.Sdk.Private">
+	<Import Project="..\..\..\src\crosstargeting_override.props" Condition="Exists('..\..\..\src\crosstargeting_override.props')" />
+
 	<PropertyGroup>
 		<TargetFrameworks Condition="'$(SamplesTargetFrameworkOverride)'!=''">$(SamplesTargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(SamplesTargetFrameworkOverride)'==''">net10.0-android;net10.0-ios;net10.0-maccatalyst;net10.0-windows10.0.26100;net10.0-browserwasm;net10.0-desktop</TargetFrameworks>
@@ -35,6 +37,7 @@
 	  https://aka.platform.uno/singleproject-features
 	-->
 		<UnoFeatures>
+			SkiaRenderer;
 		</UnoFeatures>
 
 	</PropertyGroup>

From fea077e62fe951f32e73804ac761f2417db69e40 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 21:07:48 +0000
Subject: [PATCH 07/12] fix: Improve platform detection for desktop builds

Co-authored-by: jeromelaban <5839577+jeromelaban@users.noreply.github.com>
---
 .../Content/SettingsPage.xaml.cs              | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
index 43c88035a..f572709fa 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 namespace Uno.Toolkit.Samples.Content
 {
@@ -17,7 +18,7 @@ public SettingsPage()
 			VersionTextBlock.Text = version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : "Unknown";
 
 			// Set framework information
-			FrameworkTextBlock.Text = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
+			FrameworkTextBlock.Text = RuntimeInformation.FrameworkDescription;
 
 			// Set platform information
 #if __ANDROID__
@@ -28,14 +29,25 @@ public SettingsPage()
 			PlatformTextBlock.Text = "WebAssembly";
 #elif __MACOS__
 			PlatformTextBlock.Text = "macOS";
-#elif __SKIA__
-			PlatformTextBlock.Text = "Skia (Desktop)";
 #elif WINDOWS_UWP
 			PlatformTextBlock.Text = "UWP";
-#elif WINDOWS
+#elif WINDOWS || WINDOWS_WINUI
 			PlatformTextBlock.Text = "Windows (WinUI)";
 #else
-			PlatformTextBlock.Text = "Unknown";
+			// For Skia desktop builds, detect at runtime
+			// Check if we're running on a desktop platform (Windows, Linux, macOS) but not in browser
+			var isDesktop = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || 
+			                RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || 
+			                RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+			
+			if (isDesktop)
+			{
+				PlatformTextBlock.Text = "Skia (Desktop)";
+			}
+			else
+			{
+				PlatformTextBlock.Text = "Unknown";
+			}
 #endif
 		}
 	}

From e2380e69fef3628bac7c2d7d95dfc9428194964c Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Wed, 28 Jan 2026 16:45:07 -0500
Subject: [PATCH 08/12] chore: Restore original native build

---
 .../Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj
index 07419cc06..93660a33f 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj
@@ -37,7 +37,6 @@
 	  https://aka.platform.uno/singleproject-features
 	-->
 		<UnoFeatures>
-			SkiaRenderer;
 		</UnoFeatures>
 
 	</PropertyGroup>

From df2ebe344640522fd9982887b3ca8799ec4f58aa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 22:00:23 +0000
Subject: [PATCH 09/12] feat: Add debug tools to Settings page

Co-authored-by: jeromelaban <5839577+jeromelaban@users.noreply.github.com>
---
 .../App.xaml.Navigation.cs                    |  6 +++-
 .../Content/SettingsPage.xaml                 | 28 +++++++++++++++++++
 .../Content/SettingsPage.xaml.cs              | 26 +++++++++++++++++
 .../Uno.Toolkit.Samples/Shell.xaml.cs         | 11 ++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
index a45941510..cd92208c9 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
@@ -125,7 +125,11 @@ private void OnNavigationItemInvoked(MUXC.NavigationView sender, MUXC.Navigation
 		else if (e.IsSettingsInvoked)
 		{
 			// Cache the settings page to avoid recreating it each time
-			_settingsPage ??= new Content.SettingsPage();
+			if (_settingsPage == null)
+			{
+				_settingsPage = new Content.SettingsPage();
+				_settingsPage.SetShell(_shell);
+			}
 			
 			// Clear selected item to avoid having a sample highlighted while Settings is displayed
 			_shell.NavigationView.SelectedItem = null;
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
index 4556db7f8..c0a1a2c0c 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
@@ -102,6 +102,34 @@
 						</StackPanel>
 					</Border>
 				</StackPanel>
+
+				<!-- Debug Tools Section (DEBUG only) -->
+				<StackPanel x:Name="DebugToolsSection" Spacing="16" x:Load="False">
+					<TextBlock Text="Debug Tools"
+					           FontSize="20"
+					           FontWeight="SemiBold"
+					           Foreground="{ThemeResource OnBackgroundBrush}" />
+
+					<Border Background="{ThemeResource SurfaceBrush}"
+					        CornerRadius="8"
+					        Padding="16">
+						<StackPanel Spacing="12">
+							<TextBlock Text="Development and debugging utilities"
+							           FontSize="14"
+							           Opacity="0.7"
+							           Foreground="{ThemeResource OnSurfaceBrush}"
+							           TextWrapping="Wrap" />
+							<Button x:Name="CopyVisualTreeButton"
+							        Content="Copy Visual Tree"
+							        Click="OnCopyVisualTreeClick"
+							        HorizontalAlignment="Stretch" />
+							<Button x:Name="TestVisualStateButton"
+							        Content="Test Visual State"
+							        Click="OnTestVisualStateClick"
+							        HorizontalAlignment="Stretch" />
+						</StackPanel>
+					</Border>
+				</StackPanel>
 			</StackPanel>
 		</ScrollViewer>
 	</Grid>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
index f572709fa..e29a73429 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
@@ -5,6 +5,8 @@ namespace Uno.Toolkit.Samples.Content
 {
 	public sealed partial class SettingsPage : Page
 	{
+		private Shell _shell;
+
 		public SettingsPage()
 		{
 			this.InitializeComponent();
@@ -49,6 +51,30 @@ public SettingsPage()
 				PlatformTextBlock.Text = "Unknown";
 			}
 #endif
+
+#if DEBUG
+			// Load debug tools section in DEBUG builds only
+			this.FindName(nameof(DebugToolsSection));
+#endif
+		}
+
+		public void SetShell(Shell shell)
+		{
+			_shell = shell;
+		}
+
+		private void OnCopyVisualTreeClick(object sender, RoutedEventArgs e)
+		{
+#if DEBUG
+			_shell?.DebugCopyVisualTree();
+#endif
+		}
+
+		private void OnTestVisualStateClick(object sender, RoutedEventArgs e)
+		{
+#if DEBUG
+			_shell?.DebugTestVisualState();
+#endif
 		}
 	}
 }
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
index fecf1941b..f62f78e88 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
@@ -41,6 +41,17 @@ internal void ActivateDebugPanel()
 			this.FindName("DebugPanel"); // materialize x:Load=false element
 		}
 
+		// Public methods for SettingsPage to call debug functionality
+		public void DebugCopyVisualTree()
+		{
+			DebugVT(this, null);
+		}
+
+		public void DebugTestVisualState()
+		{
+			DebugVTAsync(this, null);
+		}
+
 		private void ToggleButton_Click(object sender, RoutedEventArgs e)
 		{
 			if (this.XamlRoot.Content is FrameworkElement root)

From 00b20d4700b562f4a85cfa3a66ac3ddbc7b53d44 Mon Sep 17 00:00:00 2001
From: xiaoy312 <xiaoyao312@gmail.com>
Date: Mon, 2 Feb 2026 11:28:45 -0500
Subject: [PATCH 10/12] chore: fix DebugVTAsync impl

---
 .../Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
index f62f78e88..aefaa57c8 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
@@ -223,9 +223,12 @@ object FindViewOfInterest()
 			//if (Debugger.IsAttached) Debugger.Break();
 		}
 
-		private void DebugVTAsync(object sender, RoutedEventArgs e)
+		private async void DebugVTAsync(object sender, RoutedEventArgs e)
 		{
-			VisualStateManager.GoToState(NavigationView, "ListSizeFull", useTransitions: false);
+			// some wait time to let you open the flyout or navigate to a "nested" page
+			await Task.Delay(3000);
+
+			DebugVT(sender, e);
 		}
 
 		private void NavigationViewControl_DisplayModeChanged(MUXC.NavigationView sender, MUXC.NavigationViewDisplayModeChangedEventArgs e)

From 47fd4521956c280b847630bc5f58f27de522c012 Mon Sep 17 00:00:00 2001
From: xiaoy312 <xiaoyao312@gmail.com>
Date: Mon, 2 Feb 2026 12:21:04 -0500
Subject: [PATCH 11/12] chore: update debug panel impl

---
 .../App.xaml.Navigation.cs                    |  1 -
 .../Content/SettingsPage.xaml                 | 34 +++----------
 .../Content/SettingsPage.xaml.cs              | 49 +++++++------------
 .../Uno.Toolkit.Samples/Shell.xaml            | 16 +++---
 .../Uno.Toolkit.Samples/Shell.xaml.cs         | 38 ++++----------
 5 files changed, 42 insertions(+), 96 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
index cd92208c9..437e081a7 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs
@@ -128,7 +128,6 @@ private void OnNavigationItemInvoked(MUXC.NavigationView sender, MUXC.Navigation
 			if (_settingsPage == null)
 			{
 				_settingsPage = new Content.SettingsPage();
-				_settingsPage.SetShell(_shell);
 			}
 			
 			// Clear selected item to avoid having a sample highlighted while Settings is displayed
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
index c0a1a2c0c..5f5c228c4 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Page x:Class="Uno.Toolkit.Samples.Content.SettingsPage"
+<Page x:Class="Uno.Toolkit.Samples.Content.SettingsPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="using:Uno.Toolkit.Samples.Content"
@@ -103,32 +102,13 @@
 					</Border>
 				</StackPanel>
 
-				<!-- Debug Tools Section (DEBUG only) -->
-				<StackPanel x:Name="DebugToolsSection" Spacing="16" x:Load="False">
-					<TextBlock Text="Debug Tools"
-					           FontSize="20"
-					           FontWeight="SemiBold"
-					           Foreground="{ThemeResource OnBackgroundBrush}" />
+				<!-- Debug Tools Section -->
+				<StackPanel Spacing="16">
+
+					<Button Content="Enable visual debugging tool"
+					        Click="EnableDebugPanel"
+					        HorizontalAlignment="Stretch" />
 
-					<Border Background="{ThemeResource SurfaceBrush}"
-					        CornerRadius="8"
-					        Padding="16">
-						<StackPanel Spacing="12">
-							<TextBlock Text="Development and debugging utilities"
-							           FontSize="14"
-							           Opacity="0.7"
-							           Foreground="{ThemeResource OnSurfaceBrush}"
-							           TextWrapping="Wrap" />
-							<Button x:Name="CopyVisualTreeButton"
-							        Content="Copy Visual Tree"
-							        Click="OnCopyVisualTreeClick"
-							        HorizontalAlignment="Stretch" />
-							<Button x:Name="TestVisualStateButton"
-							        Content="Test Visual State"
-							        Click="OnTestVisualStateClick"
-							        HorizontalAlignment="Stretch" />
-						</StackPanel>
-					</Border>
 				</StackPanel>
 			</StackPanel>
 		</ScrollViewer>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
index e29a73429..897a74204 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
@@ -1,22 +1,25 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using Uno.UI.Extensions;
 
 namespace Uno.Toolkit.Samples.Content
 {
 	public sealed partial class SettingsPage : Page
 	{
-		private Shell _shell;
-
 		public SettingsPage()
 		{
 			this.InitializeComponent();
-			
-			// Initialize version information once since the page is cached
+
+			UpdateAppInfo();
+		}
+
+		private void UpdateAppInfo()
+		{
+
+			// Set version text
 			var assembly = Assembly.GetExecutingAssembly();
 			var assemblyName = assembly.GetName();
 			var version = assemblyName.Version;
-
-			// Set version text
 			VersionTextBlock.Text = version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : "Unknown";
 
 			// Set framework information
@@ -38,10 +41,10 @@ public SettingsPage()
 #else
 			// For Skia desktop builds, detect at runtime
 			// Check if we're running on a desktop platform (Windows, Linux, macOS) but not in browser
-			var isDesktop = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || 
-			                RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || 
-			                RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
-			
+			var isDesktop = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
+							RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
+							RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
 			if (isDesktop)
 			{
 				PlatformTextBlock.Text = "Skia (Desktop)";
@@ -51,30 +54,14 @@ public SettingsPage()
 				PlatformTextBlock.Text = "Unknown";
 			}
 #endif
-
-#if DEBUG
-			// Load debug tools section in DEBUG builds only
-			this.FindName(nameof(DebugToolsSection));
-#endif
-		}
-
-		public void SetShell(Shell shell)
-		{
-			_shell = shell;
 		}
 
-		private void OnCopyVisualTreeClick(object sender, RoutedEventArgs e)
+		private void EnableDebugPanel(object sender, RoutedEventArgs e)
 		{
-#if DEBUG
-			_shell?.DebugCopyVisualTree();
-#endif
-		}
-
-		private void OnTestVisualStateClick(object sender, RoutedEventArgs e)
-		{
-#if DEBUG
-			_shell?.DebugTestVisualState();
-#endif
+			if (this.FindFirstAncestor<Shell>() is { } shell)
+			{
+				shell.EnableDebugPanel();
+			}
 		}
 	}
 }
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml
index f0ee9d9ce..5c4855933 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml
@@ -56,20 +56,20 @@
 			   Grid.RowSpan="2"
 			   Visibility="Collapsed" />
 
-		<local:ModalDialog x:Name="ModalDialog" />
+		<local:ModalDialog x:Name="ModalDialog" Grid.Row="2" />
 
+		<!-- hidden debug tool, revealed from the SettingsPage -->
 		<StackPanel x:Name="DebugPanel"
-					x:Load="False"
 					Grid.RowSpan="2"
 					Background="Pink"
-					Padding="5"
+					Padding="4"
+					Spacing="4"
 					HorizontalAlignment="Center"
-					VerticalAlignment="Bottom">
+					VerticalAlignment="Bottom"
+					Visibility="Collapsed">
 			<StackPanel Orientation="Horizontal">
-				<Button Content="DebugVT"
-						Click="DebugVT" />
-				<Button Content="T"
-						Click="DebugVTAsync" />
+				<Button Content="DebugVT" Click="DebugVT" />
+				<Button Content="T" Click="DebugVTAsync" />
 			</StackPanel>
 		</StackPanel>
 	</Grid>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
index aefaa57c8..570a53f52 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Shell.xaml.cs
@@ -12,12 +12,14 @@ namespace Uno.Toolkit.Samples
 {
 	public sealed partial class Shell : UserControl
 	{
+		public static Shell GetForCurrentView() => (Shell)(App.Instance.MainWindow.Content as ExtendedSplashScreen)!.Content;
+
+		public MUXC.NavigationView NavigationView => NavigationViewControl;
+
 		public Shell()
 		{
 			this.InitializeComponent();
 
-			this.Loaded += OnLoaded;
-
 			NestedSampleFrame.RegisterPropertyChangedCallback(ContentControl.ContentProperty, OnNestedSampleFrameChanged);
 
 #if SYS_NAV_MGR_SUPPORTED
@@ -25,33 +27,6 @@ public Shell()
 #endif
 		}
 
-		public static Shell GetForCurrentView() => (Shell)(App.Instance.MainWindow.Content as ExtendedSplashScreen)!.Content;
-
-		public MUXC.NavigationView NavigationView => NavigationViewControl;
-
-		private void OnLoaded(object sender, RoutedEventArgs e)
-		{
-#if DEBUG && false
-			ActivateDebugPanel();
-#endif
-		}
-
-		internal void ActivateDebugPanel()
-		{
-			this.FindName("DebugPanel"); // materialize x:Load=false element
-		}
-
-		// Public methods for SettingsPage to call debug functionality
-		public void DebugCopyVisualTree()
-		{
-			DebugVT(this, null);
-		}
-
-		public void DebugTestVisualState()
-		{
-			DebugVTAsync(this, null);
-		}
-
 		private void ToggleButton_Click(object sender, RoutedEventArgs e)
 		{
 			if (this.XamlRoot.Content is FrameworkElement root)
@@ -162,6 +137,11 @@ public void ExitNestedSample()
 			}
 		}
 
+		internal void EnableDebugPanel()
+		{
+			DebugPanel.Visibility = Visibility.Visible;
+		}
+
 		private void DebugVT(object sender, RoutedEventArgs e)
 		{
 			object FindViewOfInterest()

From b439af1fd245c02b21c4d700ca6fd75c2bec98d9 Mon Sep 17 00:00:00 2001
From: xiaoy312 <xiaoyao312@gmail.com>
Date: Mon, 2 Feb 2026 12:32:07 -0500
Subject: [PATCH 12/12] chore: add packages info and copy button

---
 .../Content/SettingsPage.xaml                 | 21 ++++-
 .../Content/SettingsPage.xaml.cs              | 78 ++++++++++++++++---
 2 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
index 5f5c228c4..ef242654a 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml
@@ -26,7 +26,9 @@
 					<Border Background="{ThemeResource SurfaceBrush}"
 					        CornerRadius="8"
 					        Padding="16">
-						<StackPanel Spacing="12">
+						<StackPanel x:Name="AppInfoPanel" Spacing="12">
+							<!-- note: any top-level StackPanel here is automatically captured for CopyInfo -->
+
 							<!-- App Name -->
 							<StackPanel Spacing="4">
 								<TextBlock Text="Application"
@@ -74,6 +76,23 @@
 								           FontWeight="SemiBold"
 								           Foreground="{ThemeResource OnSurfaceBrush}" />
 							</StackPanel>
+
+							<!-- Package Versions -->
+							<StackPanel Spacing="4">
+								<TextBlock Text="Package Versions"
+								           FontSize="14"
+								           Opacity="0.7"
+								           Foreground="{ThemeResource OnSurfaceBrush}" />
+								<TextBox x:Name="PackageVersionsTextBlock"
+								         IsReadOnly="True"
+								         AcceptsReturn="True"
+								         FontSize="16"
+								         Foreground="{ThemeResource OnSurfaceBrush}" />
+							</StackPanel>
+
+							<Button Content="Copy to Clipboard"
+							        Click="CopyInfo"
+							        HorizontalAlignment="Stretch" />
 						</StackPanel>
 					</Border>
 				</StackPanel>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
index 897a74204..81c14e961 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Content/SettingsPage.xaml.cs
@@ -1,6 +1,8 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using Uno.Extensions;
 using Uno.UI.Extensions;
+using Windows.ApplicationModel.DataTransfer;
 
 namespace Uno.Toolkit.Samples.Content
 {
@@ -10,34 +12,39 @@ public SettingsPage()
 		{
 			this.InitializeComponent();
 
-			UpdateAppInfo();
+			UpdateAppInfoSafe();
 		}
 
+		private void UpdateAppInfoSafe()
+		{
+			// this is called in ctor, dont fail creating the page and the subsequent navigation if anything went wrong
+			try
+			{
+				UpdateAppInfo();
+			}
+			catch (Exception) { }
+		}
 		private void UpdateAppInfo()
 		{
-
 			// Set version text
-			var assembly = Assembly.GetExecutingAssembly();
-			var assemblyName = assembly.GetName();
-			var version = assemblyName.Version;
-			VersionTextBlock.Text = version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : "Unknown";
+			VersionTextBlock.Text = Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "Unknown";
 
 			// Set framework information
 			FrameworkTextBlock.Text = RuntimeInformation.FrameworkDescription;
 
 			// Set platform information
 #if __ANDROID__
-			PlatformTextBlock.Text = "Android";
+				PlatformTextBlock.Text = "Android";
 #elif __IOS__
-			PlatformTextBlock.Text = "iOS";
+				PlatformTextBlock.Text = "iOS";
 #elif __WASM__
-			PlatformTextBlock.Text = "WebAssembly";
+				PlatformTextBlock.Text = "WebAssembly";
 #elif __MACOS__
-			PlatformTextBlock.Text = "macOS";
+				PlatformTextBlock.Text = "macOS";
 #elif WINDOWS_UWP
-			PlatformTextBlock.Text = "UWP";
+				PlatformTextBlock.Text = "UWP";
 #elif WINDOWS || WINDOWS_WINUI
-			PlatformTextBlock.Text = "Windows (WinUI)";
+				PlatformTextBlock.Text = "Windows (WinUI)";
 #else
 			// For Skia desktop builds, detect at runtime
 			// Check if we're running on a desktop platform (Windows, Linux, macOS) but not in browser
@@ -54,6 +61,27 @@ private void UpdateAppInfo()
 				PlatformTextBlock.Text = "Unknown";
 			}
 #endif
+
+			// Set packages information
+			var assemblyMarkerTypes = new[]
+			{
+				typeof(Microsoft.UI.Xaml.Application),
+				typeof(Uno.Material.MaterialTheme),
+				// typeof(Uno.Cupertino.CupertinoResources),
+				typeof(Uno.Toolkit.UI.ToolkitResources),
+			};
+			PackageVersionsTextBlock.Text = string.Join("\n", assemblyMarkerTypes
+				.Select(x =>
+				{
+					var name = x.Assembly.GetName();
+					var version =
+						(x.Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion?.Trim() is { Length: > 0 } aiv ? aiv : null) ??
+						name.Version?.ToString() ??
+						"Unknown";
+
+					return $"{name.Name}: {version}";
+				})
+			);
 		}
 
 		private void EnableDebugPanel(object sender, RoutedEventArgs e)
@@ -63,5 +91,31 @@ private void EnableDebugPanel(object sender, RoutedEventArgs e)
 				shell.EnableDebugPanel();
 			}
 		}
+
+		private void CopyInfo(object sender, RoutedEventArgs e)
+		{
+			var text = string.Join('\n', AppInfoPanel.Children.OfType<StackPanel>()
+				.Select(x =>
+				{
+					var label = (x.Children.ElementAtOrDefault(0) as TextBlock)?.Text ?? "???";
+					var value = string.Join('\n', x.Children.Skip(1)
+						.Select(x => x switch
+						{
+							TextBlock tblock => tblock.Text,
+							TextBox tbox => tbox.Text,
+							_ => null,
+						})
+						.Where(x => !string.IsNullOrEmpty(x))
+					);
+
+					return value.Split(['\n', '\r']) is { Length: > 1 } multilines
+						? string.Join('\n', [$"{label}:", .. multilines.Select(x => "   " + x)])
+						: $"{label}: {value}";
+				})
+			);
+
+			Clipboard.SetContent(new DataPackage().Apply(x => x.SetText(text)));
+			Console.WriteLine(text);
+		}
 	}
 }