From 654eb62e14ebf436ddc0a8486ed24cacd099de62 Mon Sep 17 00:00:00 2001
From: eriklimakc <erik.lima@knowcode.app>
Date: Thu, 16 Jan 2025 17:55:23 +0000
Subject: [PATCH 1/2] chore: Adjust nav sample to properly navigate with to
 from query

---
 UI/Navigation/src/Navigation/App.xaml.cs      |  5 +-
 .../src/Navigation/Navigation.csproj          | 15 +-----
 .../src/Navigation/Presentation/MainPage.xaml | 11 +---
 .../ToFromQuery/ToFromQueryMainPage.xaml      | 50 +++++++++++++++++++
 .../ToFromQuery/ToFromQueryMainPage.xaml.cs   |  9 ++++
 .../ToFromQuery/ToFromQueryMainViewModel.cs   | 23 +++++++++
 .../ToFromQuery/ToFromQueryPage.xaml          |  2 +-
 UI/Navigation/src/global.json                 |  2 +-
 8 files changed, 91 insertions(+), 26 deletions(-)
 create mode 100644 UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml
 create mode 100644 UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml.cs
 create mode 100644 UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainViewModel.cs

diff --git a/UI/Navigation/src/Navigation/App.xaml.cs b/UI/Navigation/src/Navigation/App.xaml.cs
index 14191d1fd..11cb3dec3 100644
--- a/UI/Navigation/src/Navigation/App.xaml.cs
+++ b/UI/Navigation/src/Navigation/App.xaml.cs
@@ -79,7 +79,7 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 			new ViewMap<SecondPage>(),
 			new ViewMap<ThirdPage>(),
 			messageDialog,
-
+			new ViewMap<ToFromQueryMainPage, ToFromQueryMainViewModel>(),
 			// FIXME: Using the URL address bar to navigate doesn't work
 			// eg: http://localhost:5000/Main/ToFromQuery?QueryUser.Id=2b64071a-2c8a-45e4-9f48-3eb7d7aace41
 			// https://github.com/unoplatform/uno.extensions/issues/2488
@@ -163,7 +163,8 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 							#endregion
 
 							#region ToFromQuery
-							new ("ToFromQuery", View: views.FindByViewModel<ToFromQueryViewModel>()),
+							new ("ToFromQueryMain", View: views.FindByViewModel<ToFromQueryMainViewModel>()),
+							new ("ToFromQuery", View: views.FindByViewModel<ToFromQueryViewModel>(), DependsOn: "ToFromQueryMain"),
 							#endregion
 
 							#region Flyout Drawer
diff --git a/UI/Navigation/src/Navigation/Navigation.csproj b/UI/Navigation/src/Navigation/Navigation.csproj
index e6c8a7059..05bf7ca23 100644
--- a/UI/Navigation/src/Navigation/Navigation.csproj
+++ b/UI/Navigation/src/Navigation/Navigation.csproj
@@ -1,13 +1,6 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>
-      net8.0-android;
-      net8.0-ios;
-      net8.0-maccatalyst;
-      net8.0-windows10.0.19041;
-      net8.0-desktop;
-      net8.0-browserwasm;
-    </TargetFrameworks>
+    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
     <UnoSingleProject>true</UnoSingleProject>
@@ -29,11 +22,7 @@
       the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
       must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
     -->
-
-    <!-- Uno Platform 5.4 has been updated to use WinAppSDK 1.6, which necessitates a temporary version adjustment until newer versions of .NET 8 SDKs are released. -->
-    <!-- Comment this WindowsSdkPackageVersion line again once .NET SDK version 8.0.403 or later is available. -->
-    <!-- For more details, refer to: https://aka.platform.uno/migrate-from-previous#uno-platform-54 -->
-    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
+    <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
 
     <!--
       UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
diff --git a/UI/Navigation/src/Navigation/Presentation/MainPage.xaml b/UI/Navigation/src/Navigation/Presentation/MainPage.xaml
index 7519e3274..23b651a04 100644
--- a/UI/Navigation/src/Navigation/Presentation/MainPage.xaml
+++ b/UI/Navigation/src/Navigation/Presentation/MainPage.xaml
@@ -107,15 +107,8 @@
 					</muxc:NavigationViewItem.Icon>
 				</muxc:NavigationViewItem>
 
-				<muxc:NavigationViewItem uen:Region.Name="./ToFromQuery?QueryUser.Id=8a5c5b2e-ff96-474b-9e4d-65bde598f6bc"
-										 Content="FromQuery User 1">
-					<muxc:NavigationViewItem.Icon>
-						<SymbolIcon Symbol="Link" />
-					</muxc:NavigationViewItem.Icon>
-				</muxc:NavigationViewItem>
-
-				<muxc:NavigationViewItem uen:Region.Name="./ToFromQuery?QueryUser.Id=2b64071a-2c8a-45e4-9f48-3eb7d7aace41"
-										 Content="FromQuery User 2">
+				<muxc:NavigationViewItem uen:Region.Name="ToFromQueryMain"
+										 Content="FromQuery/ToQuery">
 					<muxc:NavigationViewItem.Icon>
 						<SymbolIcon Symbol="Link" />
 					</muxc:NavigationViewItem.Icon>
diff --git a/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml
new file mode 100644
index 000000000..45adbcaea
--- /dev/null
+++ b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml
@@ -0,0 +1,50 @@
+<Page x:Class="Navigation.Presentation.ToFromQueryMainPage"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:local="using:Navigation.Presentation"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  xmlns:utu="using:Uno.Toolkit.UI"
+	  xmlns:uen="using:Uno.Extensions.Navigation.UI"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+	  mc:Ignorable="d">
+
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition />
+		</Grid.RowDefinitions>
+
+		<utu:NavigationBar Content="FromQuery/ToQuery Page">
+			<utu:NavigationBar.MainCommand>
+				<AppBarButton>
+					<AppBarButton.Icon>
+						<BitmapIcon UriSource="ms-appx:///Assets/Images/back.png" />
+					</AppBarButton.Icon>
+				</AppBarButton>
+			</utu:NavigationBar.MainCommand>
+		</utu:NavigationBar>
+
+		<StackPanel Grid.Row="1"
+					HorizontalAlignment="Center"
+					VerticalAlignment="Center"
+					Spacing="16">
+			<Image Width="150"
+				   Height="150"
+				   Margin="12"
+				   HorizontalAlignment="Center"
+				   Source="ms-appx:///Assets/logo.png" />
+
+			<Button Content="See User 1"
+					HorizontalAlignment="Center"
+					uen:Navigation.Data="{Binding User1}"
+					uen:Navigation.Request="ToFromQuery" />
+
+			<Button Content="See User 2"
+					HorizontalAlignment="Center"
+					uen:Navigation.Data="{Binding User2}"
+					uen:Navigation.Request="ToFromQuery" />
+
+		</StackPanel>
+	</Grid>
+</Page>
diff --git a/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml.cs b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml.cs
new file mode 100644
index 000000000..bcb9eab40
--- /dev/null
+++ b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace Navigation.Presentation;
+
+public sealed partial class ToFromQueryMainPage : Page
+{
+	public ToFromQueryMainPage()
+	{
+		this.InitializeComponent();
+	}
+}
diff --git a/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainViewModel.cs b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainViewModel.cs
new file mode 100644
index 000000000..330911a3b
--- /dev/null
+++ b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryMainViewModel.cs
@@ -0,0 +1,23 @@
+namespace Navigation.Presentation;
+
+public partial class ToFromQueryMainViewModel : ObservableObject
+{
+	[ObservableProperty]
+	private IDictionary<string, object> user1;
+
+	[ObservableProperty]
+	private IDictionary<string, object> user2;
+
+	public ToFromQueryMainViewModel()
+	{
+		User1 = new Dictionary<string, object>
+		{
+			{ "QueryUser.Id", Guid.Parse("8a5c5b2e-ff96-474b-9e4d-65bde598f6bc") }
+		};
+
+		User2 = new Dictionary<string, object>
+		{
+			{ "QueryUser.Id", Guid.Parse("2b64071a-2c8a-45e4-9f48-3eb7d7aace41") }
+		};
+	}
+}
diff --git a/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryPage.xaml b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryPage.xaml
index 1447083e9..717c7112b 100644
--- a/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryPage.xaml
+++ b/UI/Navigation/src/Navigation/Presentation/ToFromQuery/ToFromQueryPage.xaml
@@ -14,7 +14,7 @@
 			<RowDefinition />
 		</Grid.RowDefinitions>
 
-		<utu:NavigationBar Content="ToFromQuery Page">
+		<utu:NavigationBar Content="FromQuery/ToQuery User Page">
 			<utu:NavigationBar.MainCommand>
 				<AppBarButton>
 					<AppBarButton.Icon>
diff --git a/UI/Navigation/src/global.json b/UI/Navigation/src/global.json
index 3635d42f7..42344af3d 100644
--- a/UI/Navigation/src/global.json
+++ b/UI/Navigation/src/global.json
@@ -1,7 +1,7 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.4.5"
+    "Uno.Sdk": "5.5.56"
   },
   "sdk": {
     "allowPrerelease": false

From 5bf0ff90e7362e6cf71133e8ecd70156de0df964 Mon Sep 17 00:00:00 2001
From: eriklimakc <erik.lima@knowcode.app>
Date: Tue, 28 Jan 2025 13:23:27 +0000
Subject: [PATCH 2/2] chore: Revert win tfm version

---
 UI/Navigation/src/Navigation/Navigation.csproj | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/UI/Navigation/src/Navigation/Navigation.csproj b/UI/Navigation/src/Navigation/Navigation.csproj
index 05bf7ca23..e6c8a7059 100644
--- a/UI/Navigation/src/Navigation/Navigation.csproj
+++ b/UI/Navigation/src/Navigation/Navigation.csproj
@@ -1,6 +1,13 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.26100;net8.0-browserwasm;net8.0-desktop</TargetFrameworks>
+    <TargetFrameworks>
+      net8.0-android;
+      net8.0-ios;
+      net8.0-maccatalyst;
+      net8.0-windows10.0.19041;
+      net8.0-desktop;
+      net8.0-browserwasm;
+    </TargetFrameworks>
 
     <OutputType>Exe</OutputType>
     <UnoSingleProject>true</UnoSingleProject>
@@ -22,7 +29,11 @@
       the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
       must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
     -->
-    <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
+
+    <!-- Uno Platform 5.4 has been updated to use WinAppSDK 1.6, which necessitates a temporary version adjustment until newer versions of .NET 8 SDKs are released. -->
+    <!-- Comment this WindowsSdkPackageVersion line again once .NET SDK version 8.0.403 or later is available. -->
+    <!-- For more details, refer to: https://aka.platform.uno/migrate-from-previous#uno-platform-54 -->
+    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
 
     <!--
       UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.