Merge pull request #44 from VincentH-Net/net-9-uno-6-0

Adds full support for Uno SDK 6.0 / Windows App SDK 1.7 to all CSharpMarkup.WinUI NuGets, and updates the example app to Uno 6.0 / Windows App SDK 1.7.

Author: VincentH-Net

README.md

@@ -64,6 +64,18 @@ No XAML / HTML / JavaScript / CSS required. No engine or layers to get in your w
 *Looking for C# Markup 1? Find it [here](https://github.com/VincentH-Net/CSharpForMarkup/tree/csharpformarkup1-archive)*
 
 # News
+*May 12, 2025*
+> ## New C# Markup 3.1 for Uno Platform 6.0
+Hot on the heels of the game-changing [Uno 6.0 release](https://platform.uno/blog/uno-platform-studio-6-0/), today's release adds full support for Uno SDK 6.0 / Windows App SDK 1.7 to all CSharpMarkup.WinUI NuGets.
+
+Includes support for all API improvements in Uno SDK 6.0:
+- 20+ WinUI API's are no longer marked unsupported
+- Add support for ellipse shape to `ProgressBarTemplateSettings`
+- New `TitleBar` support, including strongly-typed access to all new `Titlebar` resources in `ThemeResource`
+- New `TextBoxExtensions` allow to specify `InputReturnType`
+
+The example app in the repo is also updated to Uno 6.0 / Windows App SDK 1.7.
+
 *May 5, 2025*
 > ## New C# Markup 3.0 for Uno Platform 5.6 and .NET 9
 Today's release adds full support for Uno SDK 5.6 / Windows App SDK 1.6 and .NET 9 / .NET 8 to all CSharpMarkup.WinUI NuGets.

global.json

@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "5.6.54"
+    "Uno.Sdk": "6.0.67"
   },
   "sdk": {
     "version": "9.0.200",

src/CSharpMarkup.WinUI.Examples/Directory.Packages.props

@@ -7,10 +7,10 @@
   <ItemGroup>
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="CSharpMarkup.WinUI" Version="3.0.3" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="3.0.3" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="3.0.3" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="3.0.3" />
+    <PackageVersion Include="CSharpMarkup.WinUI" Version="3.1.0" />
+    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="3.1.0" />
+    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="3.1.0" />
+    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="3.1.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NUnit" Version="4.1.0" />
@@ -20,4 +20,4 @@
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
     <PackageVersion Include="Xamarin.UITest" Version="4.3.4" />
   </ItemGroup>
-</Project>
+</Project>

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples/Platforms/Desktop/Program.cs

@@ -1,4 +1,4 @@
-using Uno.UI.Runtime.Skia;
+using Uno.UI.Hosting;
 
 namespace WinUICsMarkupExamples;
 
@@ -7,12 +7,12 @@ public class Program
     [STAThread]
     public static void Main(string[] args)
     {
-        var host = SkiaHostBuilder.Create()
+        var host = UnoPlatformHostBuilder.Create()
             .App(() => new App())
             .UseX11()
             .UseLinuxFrameBuffer()
             .UseMacOS()
-            .UseWindows()
+            .UseWin32()
             .Build();
 
         host.Run();

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples/WinUICsMarkupExamples.csproj

@@ -42,7 +42,7 @@
       Logging;
       LoggingSerilog;
       Configuration;
-      Http;
+      HttpRefit;
       Serialization;
       Localization;
       Navigation;

src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/global.json

@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "5.6.54"
+    "Uno.Sdk": "6.0.67"
   },
   "sdk": {
     "version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/global.json

@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "5.6.54"
+    "Uno.Sdk": "6.0.67"
   },
   "sdk": {
     "version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET8_0_BrowserWasm.cs

@@ -215,10 +215,21 @@ namespace CSharpMarkup.WinUI.Uno.Extensions.Reactive // SmoothVisualStateManager
     public static partial class Helpers
     {
         /// <summary>Create a <see cref="UnoExtensionsReactive.UI.SmoothVisualStateManager"/></summary>
-        public static SmoothVisualStateManager SmoothVisualStateManager(UnoExtensionsReactive.UI.SmoothVisualStateRuleCollection Rules)
+        public static SmoothVisualStateManager SmoothVisualStateManager(params UnoExtensionsReactive.UI.SmoothVisualStateRule[] Rules)
         {
             var ui = new UnoExtensionsReactive.UI.SmoothVisualStateManager();
-            if (Rules != null) ui.Rules = Rules;
+            for (int i = 0; i < Rules.Length; i++)
+            {
+                var child = Rules[i];
+                if (child == null) continue;
+
+                var subChildren = Spreader<UnoExtensionsReactive.UI.SmoothVisualStateRule>.ExtractChildren(child);
+                if (subChildren is not null)
+                    for (int j = 0; j < subChildren.Length; j++)
+                        ui.Rules.Add(subChildren[j]);
+                else
+                    ui.Rules.Add(child);
+            }
             return CSharpMarkup.WinUI.Uno.Extensions.Reactive.SmoothVisualStateManager.StartChain(ui);
         }
 

src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/global.json

@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "5.6.54"
+    "Uno.Sdk": "6.0.67"
   },
   "sdk": {
     "version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj

@@ -44,7 +44,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios18.0;net8.0-maccatalyst18.0;net8.0-macos15.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios18.0;net8.0-maccatalyst18.0</TargetFrameworks>
 		<RootNamespace>CSharpMarkup.WinUI.Uno.Toolkit</RootNamespace>
 		<EnableDefaultPageItems>false</EnableDefaultPageItems>
 	</PropertyGroup>