Forward port 5.5 changes

build/templates/package-validation.yml

@@ -53,12 +53,14 @@ steps:
   env:
     TargetDotNetVersion: $(ValidationDotNetVersion)
 
-# Install android 34 as we're running on macos-15, early so we use the tooling from the agent
+# Install android 34 as we're running on macos-15, early so that
+# the JDK override does not break the installer
 - bash: |
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'tools' | tr '\r' '\n' | uniq
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platform-tools' | tr '\r' '\n' | uniq
-    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'build-tools;35.0.0' | tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'tools'| tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platform-tools'  | tr '\r' '\n' | uniq
     echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platforms;android-34' | tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'build-tools;35.0.0' | tr '\r' '\n' | uniq
+    echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'build-tools;34.0.0' | tr '\r' '\n' | uniq
   displayName: Install Android 34
   condition: eq(variables['Agent.OS'], 'Darwin')
 

src/Uno.Sdk/ReadMe.md

@@ -174,7 +174,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Microsoft.Extensions.Logging.Console"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-rc.2.24473.5"
+      "net9.0": "9.0.0"
     }
   },
   {
@@ -184,7 +184,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp
       "Microsoft.Windows.Compatibility"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-rc.2.24474.4"
+      "net9.0": "9.0.0"
     }
   },
   {

src/Uno.Sdk/packages.json

@@ -133,7 +133,7 @@
       "Microsoft.Extensions.Logging.Console"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-rc.2.24473.5"
+      "net9.0": "9.0.0"
     }
   },
   {
@@ -143,7 +143,7 @@
       "Microsoft.Windows.Compatibility"
     ],
     "versionOverride": {
-      "net9.0": "9.0.0-rc.2.24474.4"
+      "net9.0": "9.0.0"
     }
   },
   {

src/Uno.Templates/content/unoapp/MyExtensionsApp.1/App.blank.cs

@@ -51,7 +51,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
         MainWindow = new Window();
 //-:cnd:noEmit
 #if DEBUG
-        MainWindow.EnableHotReload();
+        MainWindow.UseStudio();
 #endif
 //+:cnd:noEmit
 

src/Uno.Templates/content/unoapp/MyExtensionsApp.1/App.recommended.cs

@@ -198,7 +198,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
 
 //-:cnd:noEmit
 #if DEBUG
-        MainWindow.EnableHotReload();
+        MainWindow.UseStudio();
 #endif
 //+:cnd:noEmit
         MainWindow.SetWindowIcon();