Upgrade to .NET 8 and Avalonia 11.0.7

This is not yet a complete upgrade, as some features have been momentarily removed, such as the map theming and the inertial scrolling. Also, analysis corrections have been applied where applicable. Bugs have not been fixed as well as many other idiosyncrasies. The Mac and Web workloads have not been looked at.

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

@@ -2,6 +2,7 @@
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using BnbnavNetClient.I18Next.Services;
+using Splat;
 
 namespace BnbnavNetClient.I18Next;
 
@@ -11,6 +12,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

@@ -7,6 +7,7 @@
 using BnbnavNetClient.Linux.TextToSpeech;
 using BnbnavNetClient.Services.TextToSpeech;
 using BnbnavNetClient.Settings;
+using Splat;
 
 namespace BnbnavNetClient.Linux;
 
@@ -15,6 +16,7 @@ internal class Program
     public static void Main(string[] args)
     {
         BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+        Locator.CurrentMutable.RegisterConstant<ITextToSpeechProvider>(new SpdTextToSpeechProvider());
     }
 
     static AppBuilder BuildAvaloniaApp()
@@ -27,7 +29,6 @@ static AppBuilder BuildAvaloniaApp()
             .LogToTrace()
             .UseReactiveUI()
             .UseI18NextLocalization()
-            .With<ITextToSpeechProvider>(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-macos10.14</TargetFramework>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 

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>
 

BnbnavNetClient.Windows/Program.cs

@@ -5,6 +5,7 @@
 using BnbnavNetClient.I18Next;
 using BnbnavNetClient.Services.TextToSpeech;
 using BnbnavNetClient.Settings;
+using Splat;
 
 namespace BnbnavNetClient.Windows;
 
@@ -14,8 +15,11 @@ class Program
     // 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);
+        Locator.CurrentMutable.RegisterConstant<ITextToSpeechProvider>(new WindowsTextToSpeechProvider());
+    }
 
     // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp()
@@ -24,6 +28,5 @@ public static AppBuilder BuildAvaloniaApp()
             .LogToTrace()
             .UseReactiveUI()
             .UseI18NextLocalization()
-            .With<ITextToSpeechProvider>(new WindowsTextToSpeechProvider())
             .UseSettings(new SettingsManagerJsonFile());
 }

BnbnavNetClient/App.axaml

@@ -10,8 +10,7 @@
   <Application.Resources>
     <ResourceDictionary>  
       <ResourceDictionary.MergedDictionaries>
-        <local:MapThemeResources Theme="Day"/>
-
+        <ResourceInclude Source="/Resources/DayTheme.axaml"/>        
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </Application.Resources>
@@ -31,6 +30,9 @@
       <Setter Property="MinWidth" Value="0"/>
       <Setter Property="VerticalAlignment" Value="Stretch"/>
     </Style>
+    <Style Selector=":is(Button).accent">
+      <Setter Property="FontWeight" Value="Bold"/>
+    </Style>
     <Style Selector="ComboBox">
       <Setter Property="Margin" Value="2"/>
     </Style>

BnbnavNetClient/App.axaml.cs

@@ -7,7 +7,9 @@
 using BnbnavNetClient.Views;
 using System;
 using System.Globalization;
+using BnbnavNetClient.Extensions;
 using BnbnavNetClient.Services.TextToSpeech;
+using Splat;
 
 namespace BnbnavNetClient;
 
@@ -16,16 +18,17 @@ public class App : Application
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
-        var settings = AvaloniaLocator.Current.GetRequiredService<ISettingsManager>();
+        var settings = Locator.Current.GetSettingsManager();
         settings.LoadAsync().Wait();
 
         var pseudo = Environment.GetEnvironmentVariable("PSEUDOLOCALIZATION") == "true";
-        var i18N = AvaloniaLocator.Current.GetRequiredService<IAvaloniaI18Next>();
+        var i18N = Locator.Current.GetI18Next();
         i18N.Initialize("BnbnavNetClient.locales", pseudo);
         i18N.CurrentLanguage = new CultureInfo(settings.Settings.Language);
 
-        var tts = AvaloniaLocator.Current.GetRequiredService<ITextToSpeechProvider>();
-        tts.CurrentCulture = CultureInfo.CurrentUICulture;
+        var tts = Locator.Current.GetService<ITextToSpeechProvider>();
+        if (tts is not null)
+            tts.CurrentCulture = CultureInfo.CurrentUICulture;
     }
 
     public override void OnFrameworkInitializationCompleted()

BnbnavNetClient/BnbnavNetClient.csproj

@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ImplicitUsings>true</ImplicitUsings>
+    <AnalysisMode>Recommended</AnalysisMode>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -18,14 +20,14 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0.13" />
     <PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
 
     <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-    <PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageReference Include="System.Speech" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
   </ItemGroup>

BnbnavNetClient/Controls/InstructionImageControl.axaml.cs

@@ -116,7 +116,7 @@ public override void Render(DrawingContext context)
                     CalculatedRoute.Instruction.InstructionTypes.Merge => "merge",
                     CalculatedRoute.Instruction.InstructionTypes.EnterRoundabout => "enter-roundabout",
                     CalculatedRoute.Instruction.InstructionTypes.LeaveRoundabout => "leave-roundabout",
-                    _ => throw new ArgumentOutOfRangeException()
+                    _ => throw new InvalidOperationException(nameof(_instruction) + " was out of range")
                 };
 
                 context.DrawSvgUrl($"avares://BnbnavNetClient/Assets/Instructions/{instructionFile}.svg", bounds);

BnbnavNetClient/Extensions/SplatExtensions.cs

@@ -0,0 +1,14 @@
+using BnbnavNetClient.I18Next.Services;
+using BnbnavNetClient.Settings;
+using Splat;
+
+namespace BnbnavNetClient.Extensions;
+
+public static class SplatExtensions
+{
+    public static IAvaloniaI18Next GetI18Next(this IReadonlyDependencyResolver me) =>
+        me.GetService<IAvaloniaI18Next>() ?? throw new InvalidOperationException("Avalonia I18Next must be registered");
+
+    public static ISettingsManager GetSettingsManager(this IReadonlyDependencyResolver me) =>
+        me.GetService<ISettingsManager>() ?? throw new InvalidOperationException("Settings manager must be registered");
+}

BnbnavNetClient/Helpers/DrawingContextExtensions.cs

@@ -24,11 +24,10 @@ public static void DrawSvgUrl(this DrawingContext context, string? url, Rect rec
         }
         else
         {
-            var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>()!;
             var uri = new Uri(url);
-            if (assetLoader.Exists(uri))
+            if (AssetLoader.Exists(uri))
             {
-                var asset = assetLoader.Open(uri);
+                var asset = AssetLoader.Open(uri);
 
                 svg = new SKSvg();
                 svg.Load(asset);