Update to 11.2

2024-10-31 18:36:40 +01:00 · 2024-10-31 18:36:40 +01:00 · 7614bd161d
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,5 +1,5 @@
 <Project>
  <PropertyGroup>
-    <AvaloniaVersion>11.0.0-preview3</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0</AvaloniaVersion>
  </PropertyGroup>
 </Project>
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
    "rollForward": "latestMinor",
    "allowPrerelease": true
  }
--- a/src/TraceCli/TraceCli.csproj
+++ b/src/TraceCli/TraceCli.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <RootNamespace>TraceCli</RootNamespace>
  </PropertyGroup>

--- a/src/TraceGui.Base/App.axaml
+++ b/src/TraceGui.Base/App.axaml
@ -2,12 +2,13 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="using:TraceGui"
             Name="Trace"
+             RequestedThemeVariant="Dark"
             x:Class="TraceGui.App">
  <Application.DataTemplates>
    <local:ViewLocator />
  </Application.DataTemplates>
  <Application.Styles>
-    <FluentTheme Mode="Dark" />
+    <FluentTheme />
    <Style Selector="TextBlock">
      <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
    </Style>
--- a/src/TraceGui.Base/TraceGui.Base.csproj
+++ b/src/TraceGui.Base/TraceGui.Base.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <RootNamespace>TraceGui</RootNamespace>
@ -13,6 +13,7 @@
    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
    <PackageReference Include="BitmapToVector" Version="1.16.3" />
    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
--- a/src/TraceGui.Base/ViewLocator.cs
+++ b/src/TraceGui.Base/ViewLocator.cs
@ -8,7 +8,7 @@ namespace TraceGui;

 public class ViewLocator : IDataTemplate
 {
-    public IControl Build(object? data)
+    public Control Build(object? data)
    {
        var name = data?.GetType().FullName?.Replace("ViewModel", "View");
        var type = name is null ? null : Type.GetType(name);
--- a/src/TraceGui.Base/ViewModels/MainWindowViewModel.cs
+++ b/src/TraceGui.Base/ViewModels/MainWindowViewModel.cs
@ -103,7 +103,7 @@ public partial class MainWindowViewModel : ViewModelBase

        var file = result.FirstOrDefault();

-        if (file is not null && file.CanOpenRead)
+        if (file is not null)
        {
            try
            {
@ -141,7 +141,7 @@ public partial class MainWindowViewModel : ViewModelBase
            ShowOverwritePrompt = true
        });

-        if (file is not null && file.CanOpenWrite)
+        if (file is not null)
        {
            try
            {
--- a/src/TraceGui.Base/Views/MainView.axaml
+++ b/src/TraceGui.Base/Views/MainView.axaml
@ -7,8 +7,7 @@
             mc:Ignorable="d" d:DesignWidth="850" d:DesignHeight="650"
             x:Class="TraceGui.Views.MainView"
             x:CompileBindings="True" x:DataType="vm:MainWindowViewModel"
-             DragDrop.AllowDrop="True"
-             FontFamily="avares://Avalonia.Themes.Fluent/Assets#Inter">
+             DragDrop.AllowDrop="True">
  <Design.DataContext>
    <vm:MainWindowViewModel />
  </Design.DataContext>
--- a/src/TraceGui.Base/Views/MainView.axaml.cs
+++ b/src/TraceGui.Base/Views/MainView.axaml.cs
@ -7,7 +7,7 @@ using TraceGui.ViewModels;

 namespace TraceGui.Views;

-public class MainView : UserControl
+public partial class MainView : UserControl
 {
    public MainView()
    {
--- a/src/TraceGui.Base/Views/MainWindow.axaml
+++ b/src/TraceGui.Base/Views/MainWindow.axaml
@ -5,7 +5,7 @@
        xmlns:views="clr-namespace:TraceGui.Views"
        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
        x:Class="TraceGui.Views.MainWindow"
-        x:Name="MainWindow"
+        x:Name="Window"
        WindowState="Normal"
        MinWidth="400"
        MinHeight="300"
@ -17,7 +17,7 @@
        UseLayoutRounding="True"
        Icon="/Assets/avalonia-logo.ico"
        Title="Trace">
-  <Panel Margin="{Binding #MainWindow.OffScreenMargin}">
+  <Panel Margin="{Binding #Window.OffScreenMargin}">
    <views:MainView />
  </Panel>
 </Window>
--- a/src/TraceGui.Base/Views/MainWindow.axaml.cs
+++ b/src/TraceGui.Base/Views/MainWindow.axaml.cs
@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;

 namespace TraceGui.Views;

-public class MainWindow : Window
+public partial class MainWindow : Window
 {
    public MainWindow()
    {
@ -18,4 +18,4 @@ public class MainWindow : Window
    {
        AvaloniaXamlLoader.Load(this);
    }
-}
+}
--- a/src/TraceGui.Base/Views/OptionsView.axaml.cs
+++ b/src/TraceGui.Base/Views/OptionsView.axaml.cs
@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;

 namespace TraceGui.Views;

-public class OptionsView : UserControl
+public partial class OptionsView : UserControl
 {
    public OptionsView()
    {
--- a/src/TraceGui.Base/Views/TraceResultView.axaml.cs
+++ b/src/TraceGui.Base/Views/TraceResultView.axaml.cs
@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;

 namespace TraceGui.Views;

-public class TraceResultView : UserControl
+public partial class TraceResultView : UserControl
 {
    public TraceResultView()
    {
--- a/src/TraceGui.Desktop/Program.cs
+++ b/src/TraceGui.Desktop/Program.cs
@ -12,19 +12,6 @@ class Program
    public static AppBuilder BuildAvaloniaApp()
        => AppBuilder.Configure<App>()
            .UsePlatformDetect()
-            .With(new Win32PlatformOptions()
-            {
-                UseDeferredRendering = true,
-                AllowEglInitialization = true,
-                UseWindowsUIComposition = true
-            })
-            .With(new X11PlatformOptions()
-            {
-                UseDeferredRendering = true
-            })
-            .With(new AvaloniaNativePlatformOptions()
-            {
-                UseDeferredRendering = true
-            })
+            .WithInterFont()
            .LogToTrace();
 }
--- a/src/TraceGui.Desktop/TraceGui.Desktop.csproj
+++ b/src/TraceGui.Desktop/TraceGui.Desktop.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <RootNamespace>TraceGui.Desktop</RootNamespace>
--- a/src/TraceGui.Web/TraceGui.Web.csproj
+++ b/src/TraceGui.Web/TraceGui.Web.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
    <OutputType>Exe</OutputType>
@ -24,7 +24,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Avalonia.Web" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
  </ItemGroup>

  <ItemGroup>