Merge pull request #43 from VincentH-Net/net-9-uno-5-6

Update to .NET 9/8 and Uno Platform 5.6

Author: VincentH-Net

global.json

@@ -1,6 +1,9 @@
-{
+{
+  "msbuild-sdks": {
+    "Uno.Sdk": "5.6.54"
+  },
   "sdk": {
-    "version": "8.0.202"
-    //"rollForward": "latestFeature"
+    "version": "9.0.200",
+    "rollForward": "latestPatch"
   }
 }

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

@@ -12,12 +12,4 @@
     -->
     <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
   </PropertyGroup>
-
-  <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
-  <PropertyGroup>
-    <UnoExtensionsVersion>4.1.14</UnoExtensionsVersion>
-    <UnoToolkitVersion>6.0.18</UnoToolkitVersion>
-    <UnoThemesVersion>5.0.13</UnoThemesVersion>
-    <UnoCSharpMarkupVersion>5.2.13</UnoCSharpMarkupVersion>
-  </PropertyGroup>
 </Project>

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

@@ -5,12 +5,12 @@
     See https://aka.platform.uno/using-uno-sdk for more information.
   -->
   <ItemGroup>
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="CSharpMarkup.WinUI" Version="2.4.16" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="2.4.16" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="2.4.16" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="2.4.16" />
+    <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="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NUnit" Version="4.1.0" />

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/FlutterViewModel.cs

@@ -6,10 +6,10 @@ public sealed partial class FlutterViewModel : BaseViewModel
     readonly List<string> subTitles = ["Subtitle 1", "Subtitle 2", "Subtitle 3"];
 
     [ObservableProperty]
-    string title = "Flutter-Like UI markup";
+    public partial string Title { get; set; } = "Flutter-Like UI markup";
 
     [ObservableProperty][NotifyPropertyChangedFor(nameof(ToggleMoreText))]
-    bool showMore = true;
+    public partial bool ShowMore { get; set; } = true;
 
     public string ToggleMoreText => ShowMore ? "Less" : "More";
 

src/CSharpMarkup.WinUI.Examples/WinUICsMarkupExamples.Presentation/Example/SearchViewModel.cs

@@ -3,9 +3,9 @@ namespace WinUICsMarkupExamples.Presentation.Example;
 [UIBindable]
 public sealed partial class SearchViewModel(INavigator navigator) : BaseViewModel
 {
-    [ObservableProperty] string searchText = "#CSharpForMarkup";
+    [ObservableProperty] public partial string SearchText { get; set; } = "#CSharpForMarkup";
 
-    [ObservableProperty] List<Tweet> searchResults = [
+    [ObservableProperty] public partial List<Tweet> SearchResults { get; set; } = [
         new() {
             AuthorImage = "https://pbs.twimg.com/profile_images/1382769074569154561/2ukpzO8E_400x400.jpg",
             Header = "Uno Platform @UnoPlatform · Nov 30",
@@ -122,10 +122,10 @@ public sealed partial class SearchViewModel(INavigator navigator) : BaseViewMode
 
     public sealed partial class Tweet : BaseViewModel
     {
-        [ObservableProperty] string? authorImage;
-        [ObservableProperty] string? header;
-        [ObservableProperty] List<TextFragment>? body;
-        [ObservableProperty] bool isLikedByMe;
+        [ObservableProperty] public partial string? AuthorImage { get; set; }
+        [ObservableProperty] public partial string? Header { get; set; }
+        [ObservableProperty] public partial List<TextFragment>? Body { get; set; }
+        [ObservableProperty] public partial bool IsLikedByMe { get; set; }
     }
 
     public sealed class TextFragment

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

@@ -1,16 +1,8 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
     <RootNamespace>WinUICsMarkupExamples.Presentation</RootNamespace>
-
-    <TargetFrameworks>
-      net8.0-android;
-      net8.0-ios;
-      net8.0-maccatalyst;
-      net8.0-windows10.0.19041;
-      net8.0;
-      net8.0-desktop;
-      net8.0-browserwasm;
-    </TargetFrameworks>
+    <LangVersion>preview</LangVersion>
+    <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
 
     <UnoSingleProject>true</UnoSingleProject>
     <OutputType>Library</OutputType>