Upgrade to .NET 9.0 (Revert WinUI)

SpannableTextView.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net9.0-windows10.0.26100</TargetFrameworks>
     <AssemblyName>Zebble.SpannableTextView</AssemblyName>
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.SpannableTextView</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>2.1.0.0</Version>
+    <Version>2.1.1.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
@@ -35,9 +35,10 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" $(TargetFramework.Contains('windows')) ">
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.0-windows')) ">
 	<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <DefineConstants>$(DefineConstants);WINUI</DefineConstants>
+	<DefineConstants>$(DefineConstants);UWP</DefineConstants>
+	<UseUwp>true</UseUwp>
   </PropertyGroup>
   <PropertyGroup Condition=" $(TargetFramework.Contains('android')) ">
     <DefineConstants>$(DefineConstants);ANDROID</DefineConstants>
@@ -49,8 +50,10 @@
   <ItemGroup>
     <Compile Include="Shared\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" $(DefineConstants.Contains('WINUI')) ">
-    <Compile Include="WinUI\**\*.cs" />
+  <ItemGroup Condition=" $(DefineConstants.Contains('UWP')) ">
+    <Compile Include="UWP\**\*.cs" />
+	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" IncludeAssets="build" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup Condition=" $(DefineConstants.Contains('ANDROID')) ">
     <Compile Include="Android\**\*.cs" />
@@ -65,8 +68,8 @@
     <None Remove="Zebble-LicenseAgreement.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.65" />
-    <PackageReference Include="Zebble" Version="5.1.2" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
+    <PackageReference Include="Zebble" Version="5.1.7" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Running)'=='local'">
     <Exec Command="update-local-nuget-cache $(TargetDir)" />

WinUI/SpannableTextViewRenderer.cs → UWP/SpannableTextViewRenderer.cs

@@ -2,18 +2,18 @@
 {
     using System;
     using System.Threading.Tasks;
-    using Microsoft.UI.Xaml;
-    using Zebble.WinUI;
+    using Windows.UI.Xaml;
+    using Zebble.UWP;
 
     internal class SpannableTextViewRenderer : INativeRenderer
     {
         SpannableTextView View;
-        WinUISpannableTextBlock Result;
+        UWPSpannableTextBlock Result;
 
         Task<FrameworkElement> INativeRenderer.Render(Renderer renderer)
         {
             View = (SpannableTextView)renderer.View;
-            Result = new WinUISpannableTextBlock(renderer);
+            Result = new UWPSpannableTextBlock(renderer);
 
             return Result.Render(renderer);
         }

WinUI/WinUIRenderExtensions.cs → UWP/UWPRenderExtensions.cs

@@ -1,12 +1,11 @@
-namespace Zebble.WinUI
+namespace Zebble.UWP
 {
-    using Microsoft.UI.Text;
-    using Olive;
     using Windows.UI.Text;
-    using doc = Microsoft.UI.Xaml.Documents;
-    using media = Microsoft.UI.Xaml.Media;
+    using doc = Windows.UI.Xaml.Documents;
+    using media = Windows.UI.Xaml.Media;
+    using Olive;
 
-    public static class WinUIRenderExtensions
+    public static class UWPRenderExtensions
     {
         internal static doc.Span RenderSpannableStringStyle(this SpannableStringStyle style)
         {

UWP/UWPSpannableTextBlock.cs

@@ -0,0 +1,47 @@
+using Windows.UI.Xaml.Documents;
+
+namespace Zebble.UWP
+{
+    public class UWPSpannableTextBlock : UWPTextBlock
+    {
+        SpannableTextView View;
+
+        public UWPSpannableTextBlock(Renderer renderer) : base(renderer.View as SpannableTextView)
+        {
+            View = renderer.View as SpannableTextView;
+
+            View.SpannableTextChanged.HandleActionOn(Thread.UI, RenderSpannableText);
+
+            RenderSpannableText();
+        }
+
+        void RenderSpannableText()
+        {
+            if (View?.ParsedText == null) return;
+
+            Result.Text = "";
+            foreach (var spannableStyle in View.ParsedText)
+            {
+                var element = spannableStyle.RenderSpannableStringStyle();
+
+                if (spannableStyle.Children.Count > 0)
+                    RenderChildSpannableStyle(element, spannableStyle);
+
+                Result.Inlines.Add(element);
+            }
+
+            View.LineHeightChanged.Raise();
+        }
+
+        void RenderChildSpannableStyle(Span parent, SpannableStringStyle parentStyle)
+        {
+            foreach (var style in parentStyle.Children)
+            {
+                var element = style.RenderSpannableStringStyle();
+                if (style.Children.Count > 0) RenderChildSpannableStyle(element, style);
+
+                parent.Inlines.Add(element);
+            }
+        }
+    }
+}