chore: Upgrade Counter samples to latest Uno.Sdk 5.6.22 and NET 9

unoplatform · Feb 3, 2025 · 6ed84c4 · 6ed84c4
1 parent 1e39f85
commit 6ed84c4
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 40 deletions.
diff --git a/reference/Counter/XAML-MVUX/.vscode/launch.json b/reference/Counter/XAML-MVUX/.vscode/launch.json
@@ -26,7 +26,7 @@
       "server": {
         "runtimeExecutable": "dotnet",
         "program": "run",
-        "args": ["--no-build","-f","net8.0-browserwasm","--launch-profile", "Counter (WebAssembly)"],
+        "args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Counter (WebAssembly)"],
         "outputCapture": "std",
         "timeout": 30000,
         "cwd": "${workspaceFolder}/Counter"
@@ -41,7 +41,7 @@
       "request": "launch",
       "preLaunchTask": "build-desktop",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/Counter/bin/Debug/net8.0-desktop/Counter.dll",
+      "program": "${workspaceFolder}/Counter/bin/Debug/net9.0-desktop/Counter.dll",
       "args": [],
       "launchSettingsProfile": "Counter (Desktop)",
       "env": {

diff --git a/reference/Counter/XAML-MVUX/.vscode/tasks.json b/reference/Counter/XAML-MVUX/.vscode/tasks.json
@@ -9,7 +9,7 @@
         "build",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-browserwasm",
+        "/property:TargetFramework=net9.0-browserwasm",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
@@ -22,7 +22,7 @@
         "publish",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-browserwasm",
+        "/property:TargetFramework=net9.0-browserwasm",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
@@ -35,7 +35,7 @@
         "build",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-desktop",
+        "/property:TargetFramework=net9.0-desktop",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
@@ -48,7 +48,7 @@
         "publish",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-desktop",
+        "/property:TargetFramework=net9.0-desktop",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"

diff --git a/reference/Counter/XAML-MVUX/Counter/App.xaml.cs b/reference/Counter/XAML-MVUX/Counter/App.xaml.cs
@@ -21,7 +21,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         MainWindow = new Window();
 #if DEBUG
-        MainWindow.EnableHotReload();
+        MainWindow.UseStudio();
 #endif
 
 

diff --git a/reference/Counter/XAML-MVUX/Counter/Counter.csproj b/reference/Counter/XAML-MVUX/Counter/Counter.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-maccatalyst;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/reference/Counter/XAML-MVUX/Counter/Properties/launchSettings.json b/reference/Counter/XAML-MVUX/Counter/Properties/launchSettings.json
@@ -42,7 +42,7 @@
     },
     "Counter (Desktop WSL2)": {
       "commandName": "WSL2",
-      "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Counter.dll",
+      "commandLineArgs": "{ProjectDir}/bin/Debug/net9.0-desktop/Counter.dll",
       "distributionName": "",
       "compatibleTargetFramework": "desktop"
     }

diff --git a/reference/Counter/XAML-MVUX/Directory.Packages.props b/reference/Counter/XAML-MVUX/Directory.Packages.props
@@ -3,6 +3,7 @@
     To update the version of Uno, you should instead update the Sdk version in the global.json file.
 
     See https://aka.platform.uno/using-uno-sdk for more information.
+    See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages.
   -->
   <ItemGroup>
   </ItemGroup>

diff --git a/reference/Counter/XAML-MVUX/global.json b/reference/Counter/XAML-MVUX/global.json
@@ -1,6 +1,9 @@
 {
   // 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.32"
+    "Uno.Sdk": "5.6.22"
+  },
+  "sdk": {
+    "allowPrerelease": false
   }
 }
diff --git a/reference/Counter/XAML-MVVM/.vscode/launch.json b/reference/Counter/XAML-MVVM/.vscode/launch.json
@@ -26,7 +26,7 @@
       "server": {
         "runtimeExecutable": "dotnet",
         "program": "run",
-        "args": ["--no-build","-f","net8.0-browserwasm","--launch-profile", "Counter (WebAssembly)"],
+        "args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Counter (WebAssembly)"],
         "outputCapture": "std",
         "timeout": 30000,
         "cwd": "${workspaceFolder}/Counter"
@@ -41,7 +41,7 @@
       "request": "launch",
       "preLaunchTask": "build-desktop",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/Counter/bin/Debug/net8.0-desktop/Counter.dll",
+      "program": "${workspaceFolder}/Counter/bin/Debug/net9.0-desktop/Counter.dll",
       "args": [],
       "launchSettingsProfile": "Counter (Desktop)",
       "env": {

diff --git a/reference/Counter/XAML-MVVM/.vscode/tasks.json b/reference/Counter/XAML-MVVM/.vscode/tasks.json
@@ -9,7 +9,7 @@
         "build",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-browserwasm",
+        "/property:TargetFramework=net9.0-browserwasm",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
@@ -22,7 +22,7 @@
         "publish",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-browserwasm",
+        "/property:TargetFramework=net9.0-browserwasm",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
@@ -35,7 +35,7 @@
         "build",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-desktop",
+        "/property:TargetFramework=net9.0-desktop",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
@@ -48,7 +48,7 @@
         "publish",
         "${workspaceFolder}/Counter/Counter.csproj",
         "/property:GenerateFullPaths=true",
-        "/property:TargetFramework=net8.0-desktop",
+        "/property:TargetFramework=net9.0-desktop",
         "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"

diff --git a/reference/Counter/XAML-MVVM/Counter/App.xaml.cs b/reference/Counter/XAML-MVVM/Counter/App.xaml.cs
@@ -21,7 +21,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         MainWindow = new Window();
 #if DEBUG
-        MainWindow.EnableHotReload();
+        MainWindow.UseStudio();
 #endif
 
 

diff --git a/reference/Counter/XAML-MVVM/Counter/Counter.csproj b/reference/Counter/XAML-MVVM/Counter/Counter.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-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
     <UnoSingleProject>true</UnoSingleProject>
@@ -29,7 +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.
     -->
-    <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/reference/Counter/XAML-MVVM/Counter/Properties/launchSettings.json b/reference/Counter/XAML-MVVM/Counter/Properties/launchSettings.json
@@ -42,7 +42,7 @@
     },
     "Counter (Desktop WSL2)": {
       "commandName": "WSL2",
-      "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Counter.dll",
+      "commandLineArgs": "{ProjectDir}/bin/Debug/net9.0-desktop/Counter.dll",
       "distributionName": "",
       "compatibleTargetFramework": "desktop"
     }

diff --git a/reference/Counter/XAML-MVVM/Directory.Packages.props b/reference/Counter/XAML-MVVM/Directory.Packages.props
@@ -3,6 +3,7 @@
     To update the version of Uno, you should instead update the Sdk version in the global.json file.
 
     See https://aka.platform.uno/using-uno-sdk for more information.
+    See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages.
   -->
   <ItemGroup>
   </ItemGroup>

diff --git a/reference/Counter/XAML-MVVM/global.json b/reference/Counter/XAML-MVVM/global.json
@@ -1,6 +1,9 @@
 {
   // 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.32"
+    "Uno.Sdk": "5.6.22"
+  },
+  "sdk": {
+    "allowPrerelease": false
   }
 }