Merge pull request #31 from 0xc3u/27-migrate-to-net-9

27 Migrate to .net 9
0xc3u · Feb 14, 2025 · 4a48057 · 4a48057
2 parents f80d33f + bcf6ef8
commit 4a48057
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ env:
   DOTNET_NOLOGO: true                     # Disable the .NET logo
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience
   DOTNET_CLI_TELEMETRY_OPTOUT: true       # Disable sending .NET CLI telemetry
-  DONET_VERSION: 8.0.402
+  DONET_VERSION: 9.0.200
 
 jobs:
   build:

diff --git a/samples/Indiko.Maui.Controls.Markdown.Sample/App.xaml.cs b/samples/Indiko.Maui.Controls.Markdown.Sample/App.xaml.cs
@@ -1,11 +1,17 @@
-namespace Indiko.Maui.Controls.Markdown.Sample;
+using Indiko.Maui.Controls.Markdown.Sample.ViewModels;
+
+namespace Indiko.Maui.Controls.Markdown.Sample;
 
 public partial class App : Application
 {
 	public App()
 	{
 		InitializeComponent();
 
-		MainPage = new AppShell();
 	}
+
+	protected override Window CreateWindow(IActivationState activationState)
+	{
+        return new Window(new AppShell());
+    }
 }
diff --git a/samples/Indiko.Maui.Controls.Markdown.Sample/Indiko.Maui.Controls.Markdown.Sample.csproj b/samples/Indiko.Maui.Controls.Markdown.Sample/Indiko.Maui.Controls.Markdown.Sample.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>Indiko.Maui.Controls.Markdown.Sample</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/src/Indiko.Maui.Controls.Markdown/Indiko.Maui.Controls.Markdown.csproj b/src/Indiko.Maui.Controls.Markdown/Indiko.Maui.Controls.Markdown.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Indiko.Maui.Controls.Markdown/LatexView.cs b/src/Indiko.Maui.Controls.Markdown/LatexView.cs
@@ -1,15 +1,11 @@
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
 using SkiaSharp.Views.Maui.Controls;
-using Typography.OpenFont;
 
 namespace Indiko.Maui.Controls.Markdown;
 
 public sealed class LatexView : SKCanvasView
 {
-
-    private System.Drawing.RectangleF _bounds;
-
     public static readonly BindableProperty TextProperty = BindableProperty.Create(propertyName: nameof(Text),
         returnType: typeof(string), declaringType: typeof(LatexView), propertyChanged: OnLatexChanged);
 
@@ -74,6 +70,7 @@ public LatexView()
     ~LatexView()
     {
         PaintSurface -= OnPainting;
+        SizeChanged -= (s, e) => UpdateSize();
     }
 
     private void UpdateSize()
@@ -98,7 +95,7 @@ private void UpdateSize()
         }
     }
 
-    private void OnPainting(object? sender, SKPaintSurfaceEventArgs e)
+    private void OnPainting(object sender, SKPaintSurfaceEventArgs e)
     {
         SKImageInfo info = e.Info;
         SKSurface surface = e.Surface;