From ca65145255b983aa4fd0269b4f327838cd248038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rik=20Lima?= <erikvilima@gmail.com>
Date: Mon, 12 May 2025 16:38:27 +0100
Subject: [PATCH] feat: Update Navigation Sample to Uno 6 and net 9

---
 UI/Navigation/src/Navigation/App.xaml.cs          |  2 +-
 UI/Navigation/src/Navigation/Navigation.csproj    | 15 ++-------------
 .../src/Navigation/Platforms/Desktop/Program.cs   |  4 ++--
 UI/Navigation/src/global.json                     |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/UI/Navigation/src/Navigation/App.xaml.cs b/UI/Navigation/src/Navigation/App.xaml.cs
index 11cb3dec3..2a6e564c2 100644
--- a/UI/Navigation/src/Navigation/App.xaml.cs
+++ b/UI/Navigation/src/Navigation/App.xaml.cs
@@ -32,7 +32,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
 		MainWindow = builder.Window;
 
 #if DEBUG
-		MainWindow.EnableHotReload();
+		MainWindow.UseStudio();
 #endif
 		MainWindow.SetWindowIcon();
 
diff --git a/UI/Navigation/src/Navigation/Navigation.csproj b/UI/Navigation/src/Navigation/Navigation.csproj
index e6c8a7059..ca569d23f 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>net9.0-android;net9.0-ios;net9.0-windows10.0.26100;net9.0-browserwasm;net9.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/Platforms/Desktop/Program.cs b/UI/Navigation/src/Navigation/Platforms/Desktop/Program.cs
index 85d27e8ef..778b04604 100644
--- a/UI/Navigation/src/Navigation/Platforms/Desktop/Program.cs
+++ b/UI/Navigation/src/Navigation/Platforms/Desktop/Program.cs
@@ -1,4 +1,4 @@
-using Uno.UI.Runtime.Skia;
+using Uno.UI.Hosting;
 
 namespace Navigation;
 public class Program
@@ -6,7 +6,7 @@ public class Program
 	[STAThread]
 	public static void Main(string[] args)
 	{
-		var host = SkiaHostBuilder.Create()
+		var host = UnoPlatformHostBuilder.Create()
 			.App(() => new App())
 			.UseX11()
 			.UseLinuxFrameBuffer()
diff --git a/UI/Navigation/src/global.json b/UI/Navigation/src/global.json
index 42344af3d..00cc18b93 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.5.56"
+    "Uno.Sdk": "6.0.67"
   },
   "sdk": {
     "allowPrerelease": false