Upgrade Avalonia, fix performance issues and bugs.

.github/workflows/linux.yaml

@@ -19,15 +19,15 @@ jobs:
         with:
           submodules: 'recursive'
       - name: "Install .NET"
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: "Build Project"
         run: dotnet publish BnbnavNetClient.Linux/BnbnavNetClient.Linux.csproj -c Release -r linux-x64 --self-contained
       - name: "Create AppDir"
         run: |
           mkdir -p bnbnav.AppDir
-          cp -r BnbnavNetClient.Linux/bin/Release/net7.0/linux-x64/publish/* bnbnav.AppDir
+          cp -r BnbnavNetClient.Linux/bin/Release/net8.0/linux-x64/publish/* bnbnav.AppDir
           cp dist/io.github.Vrabbers.bnbnav.desktop bnbnav.AppDir
           cp dist/io.github.Vrabbers.bnbnav.svg bnbnav.AppDir
           ln -s BnbnavNetClient.Linux bnbnav.AppDir/AppRun
@@ -36,7 +36,7 @@ jobs:
           curl https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage -o appimagetool-x86_64.AppImage -L
           chmod +x appimagetool-x86_64.AppImage
           ./appimagetool-x86_64.AppImage --appimage-extract-and-run bnbnav.AppDir
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: "Upload Artifact"
         with:
           name: "bnbnav-linux.AppImage"

.github/workflows/macos.yaml

@@ -23,9 +23,9 @@ jobs:
         run: |
           npm install -g appdmg
       - name: "Install .NET"
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - uses: actions/checkout@v1
         with:
           submodules: 'recursive'
@@ -36,7 +36,7 @@ jobs:
         working-directory: dist
       - name: "Create Disk Image"
         run: appdmg dist/app-dmg-spec.json ./bnbnav-mac-${{ matrix.arch }}.dmg
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: "Upload Artifact"
         with:
           name: "bnbnav-mac-${{ matrix.arch }}.dmg"

.github/workflows/win.yaml

@@ -12,29 +12,30 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
+        arch: [x64, arm64]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v1
         with:
           submodules: 'recursive'
       - name: "Install .NET"
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: "Build Project"
-        run: dotnet publish BnbnavNetClient.Windows/BnbnavNetClient.Windows.csproj -c Release -r win-x64 --self-contained
-      - uses: actions/upload-artifact@v3
+        run: dotnet publish BnbnavNetClient.Windows/BnbnavNetClient.Windows.csproj -c Release -r win-${{ matrix.arch }} --self-contained
+      - uses: actions/upload-artifact@v4
         name: "Upload Artifact"
         with:
-          name: "bnbnav-win"
-          path: "BnbnavNetClient.Windows/bin/Release/net7.0-windows/win-x64/publish"
+          name: "bnbnav-win-${{ matrix.arch }}"
+          path: "BnbnavNetClient.Windows/bin/Release/net8.0-windows/win-${{ matrix.arch }}/publish"
   release:
     runs-on: ubuntu-latest
     needs: build
     if: github.event_name == 'release'
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: "Download Artifact"
         id: download
         with:

BnbnavNetClient.I18Next/AppBuilderExtensions.cs

@@ -1,12 +1,13 @@
 using Avalonia;
 using BnbnavNetClient.I18Next.Services;
+using Splat;
 
 namespace BnbnavNetClient.I18Next;
 public static class AppBuilderExtensions
 {
     public static AppBuilder UseI18NextLocalization(this AppBuilder appBuilder)
     {
-        appBuilder.With<IAvaloniaI18Next>(new AvaloniaI18Next());
+        Locator.CurrentMutable.RegisterConstant<IAvaloniaI18Next>(new AvaloniaI18Next());
         return appBuilder;
     }
 }

BnbnavNetClient.I18Next/BnbnavNetClient.I18Next.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
       <PackageReference Include="I18Next.Net" Version="1.0.0" />
       <PackageReference Include="Sepia.Globalization" Version="0.8.0" />
+      <PackageReference Include="Splat" Version="14.8.12" />
     </ItemGroup>
 
     <ItemGroup>

BnbnavNetClient.I18Next/Services/IAvaloniaI18Next.cs

@@ -2,6 +2,9 @@
 using System.Reflection;
 
 namespace BnbnavNetClient.I18Next.Services;
+
+
+//consider using singleton class since this is only ever used as the instance
 public interface IAvaloniaI18Next
 {    
     string this[string key, Dictionary<string, object?>? arguments] { get; }

BnbnavNetClient.I18Next/TrString.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using BnbnavNetClient.I18Next.Services;
+using Splat;
 
 namespace BnbnavNetClient.I18Next;
 public sealed class TrString : AvaloniaObject
@@ -36,7 +37,7 @@ public IEnumerable<TrArgument> Arguments
 
     public TrString()
     {
-        _tr = AvaloniaLocator.Current.GetRequiredService<IAvaloniaI18Next>();
+        _tr = Locator.Current.GetService<IAvaloniaI18Next>() ?? throw new InvalidOperationException("AvaloniaI18Next must be registered for TrString to be constructed");
     }
 
     public override string ToString()

BnbnavNetClient.I18Next/TranslateExtension.cs

@@ -1,7 +1,6 @@
-
-using Avalonia;
 using Avalonia.Markup.Xaml;
 using BnbnavNetClient.I18Next.Services;
+using Splat;
 
 namespace BnbnavNetClient.I18Next;
 
@@ -11,6 +10,6 @@ public sealed class Tr : MarkupExtension
 
     public override object ProvideValue(IServiceProvider serviceProvider)
     {
-        return AvaloniaLocator.Current.GetRequiredService<IAvaloniaI18Next>()[Key];
+        return Locator.Current.GetService<IAvaloniaI18Next>()![Key];
     }
 }

BnbnavNetClient.Linux/BnbnavNetClient.Linux.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 

BnbnavNetClient.Linux/Program.cs

@@ -1,33 +1,28 @@
-// See https://aka.ms/new-console-template for more information
-
-using Avalonia;
+using Avalonia;
 using Avalonia.ReactiveUI;
-using Avalonia.Svg.Skia;
 using BnbnavNetClient.I18Next;
 using BnbnavNetClient.Linux.TextToSpeech;
 using BnbnavNetClient.Services.TextToSpeech;
 using BnbnavNetClient.Settings;
 
 namespace BnbnavNetClient.Linux;
 
-internal class Program
+internal static class Program
 {
     public static void Main(string[] args)
     {
         BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 
-    static AppBuilder BuildAvaloniaApp()
+    public static AppBuilder BuildAvaloniaApp()
     {
-        GC.KeepAlive(typeof(SvgImageExtension).Assembly);
-        GC.KeepAlive(typeof(Avalonia.Svg.Skia.Svg).Assembly);
-
         return AppBuilder.Configure<App>()
             .UsePlatformDetect()
+            .WithInterFont()
             .LogToTrace()
             .UseReactiveUI()
             .UseI18NextLocalization()
-            .With<ITextToSpeechProvider>(new SpdTextToSpeechProvider())
+            .UseTextToSpeechProvider(new SpdTextToSpeechProvider())
             .UseSettings(new SettingsManagerJsonFile());
     }
 }

BnbnavNetClient.Mac/BnbnavNetClient.Mac.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0-macos10.14</TargetFramework>
+        <TargetFramework>net8.0-macos</TargetFramework>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 

BnbnavNetClient.Mac/Info.plist

@@ -26,5 +26,7 @@
 	<string>Main</string>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
+	<key>CFBundleDisplayName</key>
+	<string>bnbnav</string>
 </dict>
 </plist>

BnbnavNetClient.Mac/Main.cs

@@ -9,10 +9,11 @@
 AppBuilder BuildAvaloniaApp()
     => AppBuilder.Configure<App>()
         .UsePlatformDetect()
+        .WithInterFont()
         .LogToTrace()
         .UseReactiveUI()
         .UseI18NextLocalization()
-        .With<ITextToSpeechProvider>(new MacTextToSpeechProvider())
+        .UseTextToSpeechProvider(new MacTextToSpeechProvider())
         .UseSettings(new SettingsManagerJsonFile());
 
 BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);

BnbnavNetClient.Web/BnbnavNetClient.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <InvariantGlobalization>false</InvariantGlobalization>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
     <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>

BnbnavNetClient.Windows/BnbnavNetClient.Windows.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
 
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="System.Speech" Version="8.0.0"/>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
   </ItemGroup>

BnbnavNetClient.Windows/Program.cs

@@ -1,5 +1,4 @@
-using System;
-using Avalonia;
+using Avalonia;
 using Avalonia.ReactiveUI;
 using BnbnavNetClient.Windows.TextToSpeech;
 using BnbnavNetClient.I18Next;
@@ -8,22 +7,25 @@
 
 namespace BnbnavNetClient.Windows;
 
-class Program
+internal static class Program
 {
     // Initialization code. Don't use any Avalonia, third-party APIs or any
     // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
     // yet and stuff might break.
     [STAThread]
-    public static void Main(string[] args) => BuildAvaloniaApp()
-        .StartWithClassicDesktopLifetime(args);
+    public static void Main(string[] args)
+    {
+        BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+    }
 
     // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
+            .WithInterFont()
             .LogToTrace()
             .UseReactiveUI()
             .UseI18NextLocalization()
-            .With<ITextToSpeechProvider>(new WindowsTextToSpeechProvider())
+            .UseTextToSpeechProvider(new WindowsTextToSpeechProvider())
             .UseSettings(new SettingsManagerJsonFile());
 }

BnbnavNetClient.Windows/TextToSpeech/WindowsTextToSpeechProvider.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using System.Speech.Synthesis;
-using System.Threading.Tasks;
 using BnbnavNetClient.Services.TextToSpeech;
 
 namespace BnbnavNetClient.Windows.TextToSpeech;

BnbnavNetClient.sln

@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BnbnavNetClient", "BnbnavNe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BnbnavNetClient.Windows", "BnbnavNetClient.Windows\BnbnavNetClient.Windows.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BnbnavNetClient.Web", "BnbnavNetClient.Web\BnbnavNetClient.Web.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3DA99C4E-89E3-4049-9C22-0A7EC60D83D8}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -35,10 +33,6 @@ Global
 		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F9360BD6-A251-478D-BDDA-6B57611055F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F9360BD6-A251-478D-BDDA-6B57611055F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9360BD6-A251-478D-BDDA-6B57611055F0}.Release|Any CPU.ActiveCfg = Release|Any CPU