manager: migrate base project structure & deps

2025-11-10 18:28:20 +01:00
parent da25510543
commit 6cf27b4867
28 changed files with 304 additions and 155 deletions
--- a/ModpackUpdater.Apps.Manager/Api/Model/IMainApi.cs
+++ b/ModpackUpdater.Apps.Manager/Api/Model/IMainApi.cs
@@ -1,14 +1,12 @@
-namespace ModpackUpdater.Apps.Manager.Api.Model;
+using Avalonia.Controls;
+
+namespace ModpackUpdater.Apps.Manager.Api.Model;

 public interface IMainApi
 {
    IWorkspace? CurWorkspace { get; }
-
    IActionSetInfos? CurActionSet { get; }
-
-    Form MainWindow { get; }
-
+    Window MainWindow { get; }
    void UpdateItem(InstallAction action);
-
    void UpdateItem(IActionSetInfos actionSetInfos);
 }
--- a/ModpackUpdater.Apps.Manager/App.axaml
+++ b/ModpackUpdater.Apps.Manager/App.axaml
@@ -0,0 +1,12 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ModpackUpdater.Apps.Manager.App"
+             RequestedThemeVariant="Default">
+             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
+
+  <Application.Styles>
+    <FluentTheme DensityStyle="Normal" />
+    <!-- <FluentTheme DensityStyle="Compact" /> -->
+    <!-- <SimpleTheme /> -->
+  </Application.Styles>
+</Application>
--- a/ModpackUpdater.Apps.Manager/App.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/App.axaml.cs
@@ -0,0 +1,21 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using ModpackUpdater.Apps.Manager.Ui;
+
+namespace ModpackUpdater.Apps.Manager;
+
+public partial class App : Application
+{
+    public override void Initialize()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    public override void OnFrameworkInitializationCompleted()
+    {
+        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            desktop.MainWindow = new MainWindow();
+        base.OnFrameworkInitializationCompleted();
+    }
+}
--- a/ModpackUpdater.Apps.Manager/Assets/app.ico
+++ b/ModpackUpdater.Apps.Manager/Assets/app.ico
--- a/ModpackUpdater.Apps.Manager/Assets/app.svg
+++ b/ModpackUpdater.Apps.Manager/Assets/app.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="480" height="480" viewBox="0 0 480 480" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <clipPath id="clip_path_1">
+      <rect width="480" height="480" />
+    </clipPath>
+  </defs>
+  <g clip-path="url(#clip_path_1)">
+    <path d="M360 40L180 40L140 0C140 0 40 0 40 0C17.91 0 0 17.91 0 40C0 40 0 120 0 120L400 120C400 120 400 80 400 80C400 57.91 382.09 40 360 40C360 40 360 40 360 40Z" fill="#FFA000" transform="translate(20 100)" />
+    <g transform="translate(53 -7)">
+      <path d="M160.042 63.3334L0 7.91667L13.9167 213.75L160.042 300.833L278.333 205.833L292.25 0L160.042 63.3334Z" fill="#5D4037" fill-rule="evenodd" transform="translate(20.875 63.333)" />
+      <path d="M0 0L13.9167 205.834L160.042 292.917L160.042 55.4167L0 0Z" fill="#8D6E63" fill-rule="evenodd" transform="translate(20.875 71.25)" />
+      <path d="M13.9167 112.084L13.9167 79.1667L27.8333 72.2554L27.8333 95L41.75 87.0833L41.75 118.75L62.625 109.028L62.625 55.4167L76.5417 48.6954L76.5417 87.0833L90.4583 80.5679L90.4583 63.3333L104.375 55.4167L104.375 35.3637L118.292 28.6979L118.292 47.5L129.425 41.1667L132.208 0L0 63.3333L0 118.75L13.9167 112.084Z" fill="#43A047" fill-rule="evenodd" transform="translate(180.917 63.333)" />
+      <path d="M0 47.5L139.167 0L292.25 39.5833L160.042 102.917L0 47.5Z" fill="#B2FF59" fill-rule="evenodd" transform="translate(20.875 23.75)" />
+      <path d="M0 0L2.78333 40.6442L13.9167 44.3888L13.9167 34.9363L27.8333 39.5833L27.8333 65.0513L48.7083 72.2792L48.7083 34.6196L62.625 39.5833L62.625 77.1004L76.5417 81.9217L76.5417 58.9713L90.4583 63.7925L90.4583 86.743L104.375 91.5563L104.375 82.1671L118.292 87.0834L118.292 74.6067L132.208 79.1667L132.208 101.199L160.042 110.833L160.042 55.4167L0 0Z" fill="#66BB6A" fill-rule="evenodd" transform="translate(20.875 71.25)" />
+    </g>
+    <path d="M360 0C360 0 40 0 40 0C17.91 0 0 15.1595 0 33.8571C0 33.8571 0 203.143 0 203.143C0 221.84 17.91 237 40 237C40 237 360 237 360 237C382.09 237 400 221.84 400 203.143C400 203.143 400 33.8571 400 33.8571C400 15.1595 382.09 0 360 0C360 0 360 0 360 0Z" fill="#FFCA28" transform="translate(20 183)" />
+    <path d="M70 80L0 0L140 0L70 80Z" fill="#1565C0" transform="translate(150 380)" />
+    <path d="M0 0L60 0L60 111.25L0 111.25L0 0Z" fill="#1565C0" transform="translate(190 280)" />
+    <path d="M30 15C30 23.28 23.29 30 15 30C6.71002 30 0 23.28 0 15C0 6.72 6.71002 0 15 0C23.29 0 30 6.72 30 15C30 15 30 15 30 15Z" fill="#4A148C" transform="translate(430 60)" />
+    <path d="M125 100C72.62 100 30 57.38 30 5C30 5 30 0 30 0L0 0L0 10C0 10 0.25 10 0.25 10C2.84 74.93 55.08 127.16 120 129.75C120 129.75 120 130 120 130L130 130L130 100L125 100C125 100 125 100 125 100Z" fill="#9C27B0" transform="translate(330 60)" />
+    <path d="M75 50C50.19 50 30 29.81 30 5C30 5 30 0 30 0L0 0L0 10C0 10 0.25 10 0.25 10C2.73004 47.36 32.63 77.27 70 79.75C70 79.75 70 80 70 80L80 80L80 50L75 50C75 50 75 50 75 50Z" fill="#7B1FA2" transform="translate(380 60)" />
+    <path d="M175 150C95.05 150 30 84.95 30 5C30 5 30 0 30 0L0 0L0 10C0 10 0.25 10 0.25 10C2.88998 102.5 77.51 177.11 170 179.75C170 179.75 170 180 170 180L180 180L180 150L175 150C175 150 175 150 175 150Z" fill="#BA68C8" transform="translate(280 60)" />
+  </g>
+</svg>
--- a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
+++ b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
@@ -2,26 +2,46 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <ApplicationIcon>icons8_Windows_Update.ico</ApplicationIcon>
-    <AssemblyName>Minecraft Modpack Update Manager</AssemblyName>
+    <ApplicationIcon>Assets\app.ico</ApplicationIcon>
+    <AssemblyName>MinecraftModpackUpdateManager</AssemblyName>
+    <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
  </PropertyGroup>

  <ItemGroup>
+    <Compile Include="..\Version.cs" />
+    <Compile Update="App.axaml.cs">
+      <DependentUpon>App.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
    <PackageReference Include="EPPlus" Version="8.2.1" />
-    <PackageReference Include="NGitLab" Version="11.0.0" />
+    <PackageReference Include="NGitLab" Version="11.0.1" />
+    <PackageReference Include="Pilz" Version="2.6.1" />
    <PackageReference Include="Pilz.Configuration" Version="3.2.7" />
+    <PackageReference Include="Pilz.Cryptography" Version="2.1.2" />
+    <PackageReference Include="Pilz.Features" Version="2.12.0" />
    <PackageReference Include="Pilz.UI" Version="3.1.1" />
-    <PackageReference Include="Pilz.UI.WinForms" Version="2.7.0" />
-    <PackageReference Include="Pilz.UI.WinForms.Telerik" Version="2.14.3" />
-    <PackageReference Include="Pilz.UI.WinForms.Telerik.Features" Version="1.9.0" />
-    <PackageReference Include="Pilz.UI.WinForms.Telerik.Symbols" Version="1.2.1" />
-    <PackageReference Include="UI.for.WinForms.Common" Version="2025.3.812" />
-    <PackageReference Include="UI.for.WinForms.GridView" Version="2025.3.812" />
-    <PackageReference Include="UI.for.WinForms.Themes" Version="2025.3.812" />
+    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.0" />
+    <PackageReference Include="Pilz.UI.AvaloniaUI.Features" Version="1.0.0" />
+    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Svg" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8">
+      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    </PackageReference>
  </ItemGroup>

  <ItemGroup>
@@ -81,4 +101,10 @@
    </EmbeddedResource>
  </ItemGroup>

+  <ItemGroup>
+    <Reference Include="Pilz">
+      <HintPath>..\..\..\.nuget\packages\pilz\2.6.1\lib\net8.0\Pilz.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
--- a/ModpackUpdater.Apps.Manager/Program.cs
+++ b/ModpackUpdater.Apps.Manager/Program.cs
@@ -1,3 +1,4 @@
+using Avalonia;
 using OfficeOpenXml;
 using Pilz.Configuration;
 using Pilz.Features;
@@ -20,24 +21,31 @@ public static class Program
    ///  The main entry point for the application.
    /// </summary>
    [STAThread]
-    internal static void Main()
+    internal static void Main(string[] args)
    {
        // To customize application configuration such as set high DPI settings or default font,
        // see https://aka.ms/applicationconfiguration.
-        ApplicationConfiguration.Initialize();
        AppGlobals.Initialize();
        PluginFeatureController.Instance.RegisterAllOwn();
-        Application.Run(new Ui.MainForm());
+        BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+    }
+
+    public static AppBuilder BuildAvaloniaApp()
+    {
+        return AppBuilder.Configure<App>()
+            .UsePlatformDetect()
+            .WithInterFont()
+            .LogToTrace();
    }

    private static string GetSettingsPath()
    {
        const string AppDataDirectoryName = "MinecraftModpackUpdateManager";
-        var SettingsFileName = $"Settings.json";
+        const string settingsFileName = "Settings.json";

        var settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), AppDataDirectoryName);
        Directory.CreateDirectory(settingsPath);
-        settingsPath = Path.Combine(settingsPath, SettingsFileName);
+        settingsPath = Path.Combine(settingsPath, settingsFileName);

        return settingsPath;
    }
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
@@ -0,0 +1,9 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ModpackUpdater.Apps.Manager.Ui.MainWindow"
+        Title="MainWindow">
+    Welcome to Avalonia!
+</Window>
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ModpackUpdater.Apps.Manager.Ui;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
--- a/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorUi.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorUi.cs
@@ -1,6 +1,5 @@
 using ModpackUpdater.Apps.Manager.Api.Model;
 using ModpackUpdater.Manager;
-using Telerik.WinControls.UI;

 namespace ModpackUpdater.Apps.Manager.Ui;

@@ -18,9 +17,7 @@ public partial class UpdatesCollectorUi : RadForm
    private readonly InstallAction[] actions;

    public ModUpdates? CurrentUpdates { get; private set; }
-
    public ModUpdateInfo? SelectedUpdate => radListView_Updates.SelectedItem?.Value as ModUpdateInfo;
-
    public int SelectedVersion => radListView_VersionTags.SelectedIndex;

    public UpdatesCollectorUi(IWorkspace workspace, params InstallAction[] actions)
--- a/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorWindow.axaml
@@ -0,0 +1,10 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        Width="800" Height="500"
+        x:Class="ModpackUpdater.Apps.Manager.Ui.UpdatesCollectorWindow"
+        Title="UpdatesCollectorWindow">
+    
+</Window>
--- a/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorWindow.axaml.cs
@@ -0,0 +1,33 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ModpackUpdater.Apps.Manager.Api.Model;
+using ModpackUpdater.Manager;
+
+namespace ModpackUpdater.Apps.Manager.Ui;
+
+public partial class UpdatesCollectorWindow : Window
+{
+    public record ModUpdateInfo(KeyValuePair<string, string>[] AvailableVersions, InstallAction Origin)
+    {
+        public int NewVersion { get; set; } = 0;
+    }
+
+    public record ModUpdates(List<ModUpdateInfo> List);
+
+    private readonly IWorkspace workspace;
+    private readonly ModpackFactory factory = new();
+    private readonly InstallAction[] actions;
+
+    public ModUpdates? CurrentUpdates { get; private set; }
+    public ModUpdateInfo? SelectedUpdate => radListView_Updates.SelectedItem?.Value as ModUpdateInfo;
+    public int SelectedVersion => radListView_VersionTags.SelectedIndex;
+    
+    public UpdatesCollectorWindow(IWorkspace workspace, params InstallAction[] actions)
+    {
+        this.workspace = workspace;
+        this.actions = actions;
+
+        InitializeComponent();
+    }
+}
--- a/ModpackUpdater.Apps.Manager/app.config
+++ b/ModpackUpdater.Apps.Manager/app.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="TelerikWinFormsThemeName" value="Windows11CompactDark" />
-  </appSettings>
-</configuration>