ui(manager): use Menus with HeaderMenuItems instead of ImageDropDownButtons

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "publish-scripts"]
+	path = publish-scripts
+	url = https://git.pilzinsel64.de/pilz-framework/publish-scripts.git

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>

ModpackUpdater.Apps.Client.Gui/AppConfig.cs

@@ -12,7 +12,6 @@ public class AppConfig : ISettingsNode, ISettingsIdentifier
     [JsonProperty, Obsolete]
     private string? LastMinecraftProfilePath
     {
-        get => RecentMinecraftProfilePaths.FirstOrDefault();
         set
         {
             if (!string.IsNullOrWhiteSpace(value))

ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs

@@ -87,7 +87,7 @@ public partial class MainForm : Window
         if (string.IsNullOrWhiteSpace(path))
             return;
 
-        AppConfig.Instance.RecentMinecraftProfilePaths.Remove(path);
+        AppConfig.Instance.RecentMinecraftProfilePaths.RemoveAll(n => n == path);
         AppConfig.Instance.RecentMinecraftProfilePaths.Insert(0, path);
         AppConfig.Instance.RecentMinecraftProfilePaths.Skip(10).ForEach(n => AppConfig.Instance.RecentMinecraftProfilePaths.Remove(n));
     }
@@ -306,7 +306,7 @@ public partial class MainForm : Window
 
     private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
     {
-        var updates = new AppUpdates("manager", this);
+        var updates = new AppUpdates("client", this);
         updates.OnDownloadProgramUpdate += (_, _) => SetStatus(GeneralLangRes.DownloadProgramUpdate, AppGlobals.Symbols.GetImageSource(AppSymbols.software_installer)); 
         await updates.UpdateApp();
         ClearStatus();

ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj

@@ -69,19 +69,19 @@
     <PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="Pilz" Version="2.6.1" />
+    <PackageReference Include="Pilz" Version="2.6.2" />
     <PackageReference Include="Pilz.Configuration" Version="3.2.7" />
     <PackageReference Include="Pilz.Cryptography" Version="2.1.2" />
     <PackageReference Include="Pilz.IO" Version="2.1.0" />
     <PackageReference Include="Pilz.UI" Version="3.1.4" />
-    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.18" />
+    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.20" />
-    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
     <PackageReference Include="Avalonia.Svg" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8">
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.9">
         <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
         <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>

ModpackUpdater.Apps.Client.Gui/publish.sh

@@ -1,12 +0,0 @@
-pupnet -y -v "$1[1]" -r linux-x64 -k appimage
-#pupnet -y -v "$1[1]" -r linux-x64 -k flatpak -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-x64 -k deb -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-x64 -k rpm -p DefineConstants=DISABLE_UPDATE
-pupnet -y -v "$1[1]" -r linux-arm64 -k appimage
-#pupnet -y -v "$1[1]" -r linux-arm64 -k flatpak -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-arm64 -k deb -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-arm64 -k rpm -p DefineConstants=DISABLE_UPDATE
-pupnet -y -v "$1[1]" -r win-x64 -k zip
-pupnet -y -v "$1[1]" -r win-arm64 -k zip
-pupnet -y -v "$1[1]" -r osx-x64 -k zip
-pupnet -y -v "$1[1]" -r osx-arm64 -k zip

ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj

@@ -23,7 +23,7 @@
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="Pilz" Version="2.6.1" />
+    <PackageReference Include="Pilz" Version="2.6.2" />
     <PackageReference Include="Pilz.Cryptography" Version="2.1.2" />
     <PackageReference Include="Pilz.IO" Version="2.1.0" />
   </ItemGroup>

ModpackUpdater.Apps.Client/Program.cs

@@ -1,5 +1,7 @@
-using Castle.Core.Logging;
+using System.Reflection;
+using Castle.Core.Logging;
 using ModpackUpdater.Manager;
+using Pilz.Extensions;
 
 namespace ModpackUpdater.Apps.Client;
 
@@ -15,9 +17,22 @@ public static class Program
     {
         Options = new Options(args);
         if (Options.Help)
+        {
+            DrawInfo();
             Options.DrawHelp();
-        else
+            return;
-            InstallWithoutGui(Options.UpdateOptions, Options.Silent);
+        }
+
+        if (!Options.Silent)
+            DrawInfo();
+        InstallWithoutGui(Options.UpdateOptions, Options.Silent);
+    }
+
+    private static void DrawInfo()
+    {
+        Console.WriteLine("Minecraft Modpack Updater CLI");
+        Console.WriteLine("Version " + Assembly.GetExecutingAssembly().GetAppVersion().ToShortString());
+        Console.WriteLine("------------------------------");
     }
 
     private static void InstallWithoutGui(UpdateCheckOptionsAdv updateOptions, bool silent)

ModpackUpdater.Apps.Client/publish.sh

@@ -1,12 +0,0 @@
-pupnet -y -v "$1[1]" -r linux-x64 -k appimage
-#pupnet -y -v "$1[1]" -r linux-x64 -k flatpak
-#pupnet -y -v "$1[1]"-r linux-x64 -k deb
-#pupnet -y -v "$1[1]"-r linux-x64 -k rpm
-pupnet -y -v "$1[1]" -r linux-arm64 -k appimage
-#pupnet -y -v "$1[1]" -r linux-arm64 -k flatpak
-#pupnet -y -v "$1[1]"-r linux-arm64 -k deb
-#pupnet -y -v "$1[1]"-r linux-arm64 -k rpm
-pupnet -y -v "$1[1]" -r win-x64 -k zip
-pupnet -y -v "$1[1]" -r win-arm64 -k zip
-pupnet -y -v "$1[1]" -r osx-x64 -k zip
-pupnet -y -v "$1[1]" -r osx-arm64 -k zip

ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs

@@ -11,46 +11,32 @@ namespace ModpackUpdater.Apps.Manager.LangRes {
     using System;
     
     
-    /// <summary>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    /// </summary>
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class GeneralLangRes {
         
-        private static global::System.Resources.ResourceManager resourceMan;
+        private static System.Resources.ResourceManager resourceMan;
         
-        private static global::System.Globalization.CultureInfo resourceCulture;
+        private static System.Globalization.CultureInfo resourceCulture;
         
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal GeneralLangRes() {
         }
         
-        /// <summary>
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        ///   Returns the cached ResourceManager instance used by this class.
+        public static System.Resources.ResourceManager ResourceManager {
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+                if (object.Equals(null, resourceMan)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.GeneralLangRes", typeof(GeneralLangRes).Assembly);
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.GeneralLangRes", typeof(GeneralLangRes).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
         
-        /// <summary>
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        ///   Overrides the current thread's CurrentUICulture property for all
+        public static System.Globalization.CultureInfo Culture {
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -59,418 +45,286 @@ namespace ModpackUpdater.Apps.Manager.LangRes {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Add.
-        /// </summary>
-        public static string Add {
-            get {
-                return ResourceManager.GetString("Add", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Create update.
-        /// </summary>
-        public static string CreateUpdate {
-            get {
-                return ResourceManager.GetString("CreateUpdate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Destination.
-        /// </summary>
-        public static string Destination {
-            get {
-                return ResourceManager.GetString("Destination", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Destination path.
-        /// </summary>
-        public static string DestinationPath {
-            get {
-                return ResourceManager.GetString("DestinationPath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to File location of &quot;install.json&quot;.
-        /// </summary>
-        public static string FileLocationOfInstallJson {
-            get {
-                return ResourceManager.GetString("FileLocationOfInstallJson", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to File location of &quot;update.json&quot;.
-        /// </summary>
-        public static string FileLocationOfUpdateJson {
-            get {
-                return ResourceManager.GetString("FileLocationOfUpdateJson", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to General.
-        /// </summary>
-        public static string General {
-            get {
-                return ResourceManager.GetString("General", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to GitLab Api token.
-        /// </summary>
-        public static string GitLabApiToken {
-            get {
-                return ResourceManager.GetString("GitLabApiToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to GitLab instance url.
-        /// </summary>
-        public static string GitLabInstanceUrl {
-            get {
-                return ResourceManager.GetString("GitLabInstanceUrl", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Id.
-        /// </summary>
-        public static string Id {
-            get {
-                return ResourceManager.GetString("Id", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Inherit from.
-        /// </summary>
-        public static string InheritFrom {
-            get {
-                return ResourceManager.GetString("InheritFrom", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Is directory.
-        /// </summary>
-        public static string IsDirectory {
-            get {
-                return ResourceManager.GetString("IsDirectory", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Is extra.
-        /// </summary>
-        public static string IsExtra {
-            get {
-                return ResourceManager.GetString("IsExtra", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Is Zip archive.
-        /// </summary>
-        public static string IsZipArchive {
-            get {
-                return ResourceManager.GetString("IsZipArchive", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Metadata.
-        /// </summary>
-        public static string Metadata {
-            get {
-                return ResourceManager.GetString("Metadata", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Modlist for v{0}.
-        /// </summary>
         public static string ModlistForVersionX {
             get {
                 return ResourceManager.GetString("ModlistForVersionX", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string GitLabInstanceUrl {
-        ///   Looks up a localized string similar to Modpack config url.
-        /// </summary>
-        public static string ModpackConfigUrl {
             get {
-                return ResourceManager.GetString("ModpackConfigUrl", resourceCulture);
+                return ResourceManager.GetString("GitLabInstanceUrl", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string GitLabApiToken {
-        ///   Looks up a localized string similar to Name.
-        /// </summary>
-        public static string Name {
             get {
-                return ResourceManager.GetString("Name", resourceCulture);
+                return ResourceManager.GetString("GitLabApiToken", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to New workspace.
-        /// </summary>
-        public static string NewWorkspace {
-            get {
-                return ResourceManager.GetString("NewWorkspace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Public.
-        /// </summary>
-        public static string Public {
-            get {
-                return ResourceManager.GetString("Public", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Recent workspace.
-        /// </summary>
-        public static string RecentWorkspaces {
-            get {
-                return ResourceManager.GetString("RecentWorkspaces", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove.
-        /// </summary>
-        public static string Remove {
-            get {
-                return ResourceManager.GetString("Remove", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove update.
-        /// </summary>
-        public static string RemoveUpdate {
-            get {
-                return ResourceManager.GetString("RemoveUpdate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Repository Id.
-        /// </summary>
         public static string RepositoryId {
             get {
                 return ResourceManager.GetString("RepositoryId", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Root folder path.
-        /// </summary>
         public static string RootFolderPath {
             get {
                 return ResourceManager.GetString("RootFolderPath", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string FileLocationOfInstallJson {
-        ///   Looks up a localized string similar to Save workspace.
-        /// </summary>
-        public static string SaveWorkspace {
             get {
-                return ResourceManager.GetString("SaveWorkspace", resourceCulture);
+                return ResourceManager.GetString("FileLocationOfInstallJson", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string FileLocationOfUpdateJson {
-        ///   Looks up a localized string similar to Search.
-        /// </summary>
-        public static string Search {
             get {
-                return ResourceManager.GetString("Search", resourceCulture);
+                return ResourceManager.GetString("FileLocationOfUpdateJson", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string ModpackConfigUrl {
-        ///   Looks up a localized string similar to Select.
-        /// </summary>
-        public static string Select {
             get {
-                return ResourceManager.GetString("Select", resourceCulture);
+                return ResourceManager.GetString("ModpackConfigUrl", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string Remove {
-        ///   Looks up a localized string similar to Select root folder.
-        /// </summary>
-        public static string SelectRootFolder {
             get {
-                return ResourceManager.GetString("SelectRootFolder", resourceCulture);
+                return ResourceManager.GetString("Remove", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Side.
-        /// </summary>
-        public static string Side {
-            get {
-                return ResourceManager.GetString("Side", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source.
-        /// </summary>
-        public static string Source {
-            get {
-                return ResourceManager.GetString("Source", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source name.
-        /// </summary>
-        public static string SourceName {
-            get {
-                return ResourceManager.GetString("SourceName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source owner.
-        /// </summary>
-        public static string SourceOwner {
-            get {
-                return ResourceManager.GetString("SourceOwner", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source path.
-        /// </summary>
-        public static string SourcePath {
-            get {
-                return ResourceManager.GetString("SourcePath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source RegEx.
-        /// </summary>
-        public static string SourceRegex {
-            get {
-                return ResourceManager.GetString("SourceRegex", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source type.
-        /// </summary>
-        public static string SourceType {
-            get {
-                return ResourceManager.GetString("SourceType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Source URL.
-        /// </summary>
-        public static string SourceUrl {
-            get {
-                return ResourceManager.GetString("SourceUrl", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to State.
-        /// </summary>
-        public static string State {
-            get {
-                return ResourceManager.GetString("State", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Tools.
-        /// </summary>
-        public static string Tools {
-            get {
-                return ResourceManager.GetString("Tools", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Update.
-        /// </summary>
-        public static string Update {
-            get {
-                return ResourceManager.GetString("Update", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Updates.
-        /// </summary>
-        public static string Updates {
-            get {
-                return ResourceManager.GetString("Updates", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Update type.
-        /// </summary>
-        public static string UpdateType {
-            get {
-                return ResourceManager.GetString("UpdateType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Website.
-        /// </summary>
-        public static string Website {
-            get {
-                return ResourceManager.GetString("Website", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workspace.
-        /// </summary>
-        public static string Workspace {
-            get {
-                return ResourceManager.GetString("Workspace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workspace preferences.
-        /// </summary>
         public static string WorkspacePreferences {
             get {
                 return ResourceManager.GetString("WorkspacePreferences", resourceCulture);
             }
         }
         
-        /// <summary>
+        public static string SaveWorkspace {
-        ///   Looks up a localized string similar to ZIP archive path.
+            get {
-        /// </summary>
+                return ResourceManager.GetString("SaveWorkspace", resourceCulture);
+            }
+        }
+        
+        public static string NewWorkspace {
+            get {
+                return ResourceManager.GetString("NewWorkspace", resourceCulture);
+            }
+        }
+        
+        public static string RecentWorkspaces {
+            get {
+                return ResourceManager.GetString("RecentWorkspaces", resourceCulture);
+            }
+        }
+        
+        public static string Workspace {
+            get {
+                return ResourceManager.GetString("Workspace", resourceCulture);
+            }
+        }
+        
+        public static string CreateUpdate {
+            get {
+                return ResourceManager.GetString("CreateUpdate", resourceCulture);
+            }
+        }
+        
+        public static string RemoveUpdate {
+            get {
+                return ResourceManager.GetString("RemoveUpdate", resourceCulture);
+            }
+        }
+        
+        public static string Update {
+            get {
+                return ResourceManager.GetString("Update", resourceCulture);
+            }
+        }
+        
+        public static string Tools {
+            get {
+                return ResourceManager.GetString("Tools", resourceCulture);
+            }
+        }
+        
+        public static string Updates {
+            get {
+                return ResourceManager.GetString("Updates", resourceCulture);
+            }
+        }
+        
+        public static string Add {
+            get {
+                return ResourceManager.GetString("Add", resourceCulture);
+            }
+        }
+        
+        public static string Public {
+            get {
+                return ResourceManager.GetString("Public", resourceCulture);
+            }
+        }
+        
+        public static string Id {
+            get {
+                return ResourceManager.GetString("Id", resourceCulture);
+            }
+        }
+        
+        public static string Side {
+            get {
+                return ResourceManager.GetString("Side", resourceCulture);
+            }
+        }
+        
+        public static string UpdateType {
+            get {
+                return ResourceManager.GetString("UpdateType", resourceCulture);
+            }
+        }
+        
+        public static string SourceType {
+            get {
+                return ResourceManager.GetString("SourceType", resourceCulture);
+            }
+        }
+        
+        public static string DestinationPath {
+            get {
+                return ResourceManager.GetString("DestinationPath", resourceCulture);
+            }
+        }
+        
+        public static string State {
+            get {
+                return ResourceManager.GetString("State", resourceCulture);
+            }
+        }
+        
+        public static string InheritFrom {
+            get {
+                return ResourceManager.GetString("InheritFrom", resourceCulture);
+            }
+        }
+        
+        public static string SourcePath {
+            get {
+                return ResourceManager.GetString("SourcePath", resourceCulture);
+            }
+        }
+        
+        public static string IsDirectory {
+            get {
+                return ResourceManager.GetString("IsDirectory", resourceCulture);
+            }
+        }
+        
+        public static string General {
+            get {
+                return ResourceManager.GetString("General", resourceCulture);
+            }
+        }
+        
+        public static string Name {
+            get {
+                return ResourceManager.GetString("Name", resourceCulture);
+            }
+        }
+        
+        public static string IsExtra {
+            get {
+                return ResourceManager.GetString("IsExtra", resourceCulture);
+            }
+        }
+        
+        public static string Destination {
+            get {
+                return ResourceManager.GetString("Destination", resourceCulture);
+            }
+        }
+        
+        public static string Source {
+            get {
+                return ResourceManager.GetString("Source", resourceCulture);
+            }
+        }
+        
+        public static string IsZipArchive {
+            get {
+                return ResourceManager.GetString("IsZipArchive", resourceCulture);
+            }
+        }
+        
+        public static string SourceOwner {
+            get {
+                return ResourceManager.GetString("SourceOwner", resourceCulture);
+            }
+        }
+        
+        public static string SourceName {
+            get {
+                return ResourceManager.GetString("SourceName", resourceCulture);
+            }
+        }
+        
+        public static string SourceTag {
+            get {
+                return ResourceManager.GetString("SourceTag", resourceCulture);
+            }
+        }
+        
+        public static string SourceRegex {
+            get {
+                return ResourceManager.GetString("SourceRegex", resourceCulture);
+            }
+        }
+        
+        public static string SourceUrl {
+            get {
+                return ResourceManager.GetString("SourceUrl", resourceCulture);
+            }
+        }
+        
         public static string ZipArchivePath {
             get {
                 return ResourceManager.GetString("ZipArchivePath", resourceCulture);
             }
         }
+        
+        public static string Metadata {
+            get {
+                return ResourceManager.GetString("Metadata", resourceCulture);
+            }
+        }
+        
+        public static string Website {
+            get {
+                return ResourceManager.GetString("Website", resourceCulture);
+            }
+        }
+        
+        public static string Select {
+            get {
+                return ResourceManager.GetString("Select", resourceCulture);
+            }
+        }
+        
+        public static string SelectRootFolder {
+            get {
+                return ResourceManager.GetString("SelectRootFolder", resourceCulture);
+            }
+        }
+        
+        public static string Search {
+            get {
+                return ResourceManager.GetString("Search", resourceCulture);
+            }
+        }
     }
 }

ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx

@@ -231,6 +231,9 @@
   <data name="SourceName" xml:space="preserve">
     <value>Source name</value>
   </data>
+  <data name="SourceTag" xml:space="preserve">
+    <value>Source tag</value>
+  </data>
   <data name="SourceRegex" xml:space="preserve">
     <value>Source RegEx</value>
   </data>

ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj

@@ -49,25 +49,25 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.9" />
     <PackageReference Include="DynamicData" Version="9.4.1" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
-    <PackageReference Include="EPPlus" Version="8.2.1" />
+    <PackageReference Include="EPPlus" Version="8.3.1" />
-    <PackageReference Include="NGitLab" Version="11.0.1" />
+    <PackageReference Include="NGitLab" Version="11.1.0" />
-    <PackageReference Include="Pilz" Version="2.6.1" />
+    <PackageReference Include="Pilz" Version="2.6.2" />
     <PackageReference Include="Pilz.Configuration" Version="3.2.7" />
     <PackageReference Include="Pilz.Cryptography" Version="2.1.2" />
     <PackageReference Include="Pilz.Features" Version="2.13.0" />
     <PackageReference Include="Pilz.UI" Version="3.1.4" />
-    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.18" />
+    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.20" />
     <PackageReference Include="Pilz.UI.AvaloniaUI.Features" Version="1.0.1" />
-    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
     <PackageReference Include="Avalonia.Svg" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8">
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.9">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
@@ -143,10 +143,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Pilz">
-      <HintPath>..\..\..\.nuget\packages\pilz\2.6.1\lib\net8.0\Pilz.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml

@@ -3,7 +3,6 @@
   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"
-  xmlns:local="clr-namespace:ModpackUpdater.Apps.Manager.Ui"
   xmlns:pilz="https://git.pilzinsel64.de/pilz-framework/pilz"
   xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
   xmlns:mainWindow="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models.MainWindow"
@@ -15,7 +14,7 @@
   Loaded="Window_OnLoaded"
   Closed="Window_OnClosed"
   KeyDown="Window_OnKeyDown">
-  
+
   <Grid
     x:Name="GridMain"
     x:DataType="mainWindow:MainWindowViewModel"
@@ -25,55 +24,45 @@
     ColumnSpacing="6"
     Margin="3">
 
-    <!-- StackPanel: Workspace -->
+    <!-- Menu: Workspace -->
-    <StackPanel
+    <Menu
       Grid.Column="0"
-      Grid.Row="0"
+      Grid.Row="0">
-      Orientation="Horizontal">
+      
+      <Menu.Items>
+        <!-- MenuItem: Workspace -->
+        <pilz:HeaderMenuItem
+          x:Name="MenuItemWorkspace"
+          HeaderText="{x:Static langRes:GeneralLangRes.Workspace}">
 
-      <!-- Button: Workspace -->
+          <pilz:HeaderMenuItem.Items>
-      <pilz:ImageButton
+            <MenuItem x:Name="MenuItemWorkspacePreferences" Header="{x:Static langRes:GeneralLangRes.WorkspacePreferences}" Click="MenuItemWorkspacePreferences_OnClick"/>
-        x:Name="ButtonWorkspace"
+            <MenuItem x:Name="MenuItemSaveWorkspace" Header="{x:Static langRes:GeneralLangRes.SaveWorkspace}" HotKey="Ctrl+S" Click="MenuItemSaveWorkspace_OnClick"/>
-        Text="{x:Static langRes:GeneralLangRes.Workspace}"
+            <Separator/>
-        Background="Transparent">
+            <MenuItem x:Name="MenuItemNewWorkspace" Header="{x:Static langRes:GeneralLangRes.NewWorkspace}"/>
+            <Separator/>
+            <MenuItem x:Name="MenuItemRecentWorkspaces" Header="{x:Static langRes:GeneralLangRes.RecentWorkspaces}"/>
+          </pilz:HeaderMenuItem.Items>
+        </pilz:HeaderMenuItem>
 
-        <pilz:ImageButton.Flyout>
+        <!-- MenuItem: Update -->
-          <MenuFlyout>
+        <pilz:HeaderMenuItem
-            <MenuFlyout.Items>
+          x:Name="MenuItemUpdate"
-              <MenuItem x:Name="MenuItemWorkspacePreferences" Header="{x:Static langRes:GeneralLangRes.WorkspacePreferences}" Click="MenuItemWorkspacePreferences_OnClick"/>
+          HeaderText="{x:Static langRes:GeneralLangRes.Update}">
-              <MenuItem x:Name="MenuItemSaveWorkspace" Header="{x:Static langRes:GeneralLangRes.SaveWorkspace}" HotKey="Ctrl+S" Click="MenuItemSaveWorkspace_OnClick"/>
-              <Separator/>
-              <MenuItem x:Name="MenuItemNewWorkspace" Header="{x:Static langRes:GeneralLangRes.NewWorkspace}"/>
-              <Separator/>
-              <MenuItem x:Name="MenuItemRecentWorkspaces" Header="{x:Static langRes:GeneralLangRes.RecentWorkspaces}"/>
-            </MenuFlyout.Items>
-          </MenuFlyout>
-        </pilz:ImageButton.Flyout>
-      </pilz:ImageButton>
 
-      <!-- Button: Update -->
+          <pilz:HeaderMenuItem.Items>
-      <pilz:ImageButton
+            <MenuItem x:Name="MenuItemCreateUpdate" Header="{x:Static langRes:GeneralLangRes.CreateUpdate}" Click="MenuItemCreateUpdate_OnClick"/>
-        x:Name="ButtonUpdate"
+            <MenuItem x:Name="MenuItemRemoveUpdate" Header="{x:Static langRes:GeneralLangRes.RemoveUpdate}" Click="MenuItemRemoveUpdate_OnClick"/>
-        Text="{x:Static langRes:GeneralLangRes.Update}"
+          </pilz:HeaderMenuItem.Items>
-        Background="Transparent">
+        </pilz:HeaderMenuItem>
 
-        <pilz:ImageButton.Flyout>
+        <!-- MenuItem: Workspace -->
-          <MenuFlyout>
+        <pilz:HeaderMenuItem
-            <MenuFlyout.Items>
+          x:Name="MenuItemTools"
-              <MenuItem x:Name="MenuItemCreateUpdate" Header="{x:Static langRes:GeneralLangRes.CreateUpdate}" Click="MenuItemCreateUpdate_OnClick"/>
+          HeaderText="{x:Static langRes:GeneralLangRes.Tools}"/>
-              <MenuItem x:Name="MenuItemRemoveUpdate" Header="{x:Static langRes:GeneralLangRes.RemoveUpdate}" Click="MenuItemRemoveUpdate_OnClick"/>
+      </Menu.Items>
-            </MenuFlyout.Items>
+    </Menu>
-          </MenuFlyout>
-        </pilz:ImageButton.Flyout>
-      </pilz:ImageButton>
 
-      <!-- Button: Tools -->
-      <pilz:ImageButton
-        x:Name="ButtonTools"
-        Text="{x:Static langRes:GeneralLangRes.Tools}"
-        Background="Transparent"/>
-    </StackPanel>
-    
     <!-- TreeView: Workspace -->
     <ScrollViewer
       Grid.Column="0"
@@ -82,6 +71,7 @@
 
       <StackPanel>
         <TreeView
+          x:Name="TreeViewWorkspace"
           ItemsSource="{Binding CurrentTreeNodes}"
           SelectedItem="{Binding SelectedTreeNode}">
 
@@ -109,27 +99,14 @@
       Orientation="Horizontal"
       VerticalAlignment="Center">
 
-      <!-- Panel: Menu list -->
+      <!-- Menu: Actions -->
-      <StackPanel
+      <Menu>
-        Orientation="Horizontal">
+        <Menu.Items>
-        
+          <pilz:HeaderMenuItem x:Name="MenuItemAddAction" HeaderText="{x:Static langRes:GeneralLangRes.Add}" Click="ButtonAddAction_OnClick"/>
-        <!-- Button: Add action -->
+          <pilz:HeaderMenuItem x:Name="MenuItemRemoveAction" HeaderText="{x:Static langRes:GeneralLangRes.Remove}" Click="ButtonRemoveAction_OnClick"/>
-        <pilz:ImageButton
+        </Menu.Items>
-          x:Name="ButtonAddAction"
+      </Menu>
-          Text="{x:Static langRes:GeneralLangRes.Add}"
-          ImageSource="{x:Static local:MainWindow.ButtonImageAddAction}"
-          Background="Transparent"
-          Click="ButtonAddAction_OnClick"/>
 
-        <!-- Button: Remove action -->
-        <pilz:ImageButton
-          x:Name="ButtonRemoveAction"
-          Text="{x:Static langRes:GeneralLangRes.Remove}"
-          ImageSource="{x:Static local:MainWindow.ButtonImageRemoveAction}"
-          Background="Transparent"
-          Click="ButtonRemoveAction_OnClick"/>
-      </StackPanel>
-      
       <!-- TextBox: Search -->
       <TextBox
         Width="200"
@@ -138,8 +115,7 @@
 
       <!-- Panel: Menu -->
       <ContentControl
-        Content="{Binding SelectedTreeNode}"
+        Content="{Binding SelectedTreeNode}">
-        >
 
         <ContentControl.DataTemplates>
           <DataTemplate
@@ -185,11 +161,11 @@
       VerticalAlignment="Stretch"
       ItemsSource="{Binding CurrentGridRows.View}"
       SelectedItem="{Binding SelectedGridRow}">
-      
+
       <DataGrid.ContextMenu>
         <ContextMenu x:Name="ContextMenuActions"/>
       </DataGrid.ContextMenu>
-      
+
       <DataGrid.Columns>
         <DataGridTextColumn
           Header="{x:Static langRes:GeneralLangRes.Id}"
@@ -218,10 +194,10 @@
           Header="{x:Static langRes:GeneralLangRes.DestinationPath}"
           Binding="{Binding InheritedDestPath}"
           Width="*"/>
-        
+
         <DataGridTemplateColumn
           Header="{x:Static langRes:GeneralLangRes.State}">
-          
+
           <DataGridTemplateColumn.CellTemplate>
             <DataTemplate>
               <Image
@@ -374,7 +350,7 @@
         <!-- Source -->
         <Grid
           ColumnDefinitions="150,*"
-          RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
+          RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
           RowSpacing="6"
           ColumnSpacing="6">
 
@@ -420,23 +396,30 @@
             x:Name="TextBoxInstallActionSourceName"
             Text="{Binding SourceName}"/>
 
-          <!-- Source RegEx -->
+          <!-- Source tag -->
-          <Label Grid.Row="5" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.SourceRegex}" Target="TextBoxInstallActionSourceRegEx"/>
+          <Label Grid.Row="5" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.SourceTag}" Target="TextBoxInstallActionSourceTag"/>
           <TextBox
             Grid.Row="5" Grid.Column="1"
+            x:Name="TextBoxInstallActionSourceTag"
+            Text="{Binding SourceTag}"/>
+
+          <!-- Source RegEx -->
+          <Label Grid.Row="6" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.SourceRegex}" Target="TextBoxInstallActionSourceRegEx"/>
+          <TextBox
+            Grid.Row="6" Grid.Column="1"
             x:Name="TextBoxInstallActionSourceRegEx"
             Text="{Binding SourceRegex}"/>
 
           <!-- Source url -->
-          <Label Grid.Row="6" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.SourceUrl}" Target="TextBoxInstallActionSourceUrl"/>
+          <Label Grid.Row="7" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.SourceUrl}" Target="TextBoxInstallActionSourceUrl"/>
           <TextBox
-            Grid.Row="6" Grid.Column="1"
+            Grid.Row="7" Grid.Column="1"
             x:Name="TextBoxInstallActionSourceUrl" Text="{Binding SourceUrl}"/>
 
           <!-- Zip archive path -->
-          <Label Grid.Row="7" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.ZipArchivePath}" Target="TextBoxInstallActionZipArchivePath"/>
+          <Label Grid.Row="8" Grid.Column="0" Content="{x:Static langRes:GeneralLangRes.ZipArchivePath}" Target="TextBoxInstallActionZipArchivePath"/>
           <TextBox
-            Grid.Row="7" Grid.Column="1"
+            Grid.Row="8" Grid.Column="1"
             x:Name="TextBoxInstallActionZipArchivePath"
             Text="{Binding ZipPath}"/>
         </Grid>

ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs

@@ -2,7 +2,6 @@ using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
 using DynamicData;
 using ModpackUpdater.Apps.Manager.Api;
 using ModpackUpdater.Apps.Manager.Api.Model;
@@ -20,9 +19,6 @@ namespace ModpackUpdater.Apps.Manager.Ui;
 
 public partial class MainWindow : Window, IMainApi
 {
-    public static IImage? ButtonImageAddAction => AppGlobals.Symbols.GetImageSource(AppSymbols.add);
-    public static IImage? ButtonImageRemoveAction => AppGlobals.Symbols.GetImageSource(AppSymbols.remove);
-
     private WorkspaceFeature? curWs;
     
     public MainWindowViewModel Model { get; } = new();
@@ -38,15 +34,17 @@ public partial class MainWindow : Window, IMainApi
         
         GridMain.DataContext = Model;
         
-        ButtonWorkspace.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.workspace);
+        MenuItemWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.workspace, SymbolSize.Small);
         MenuItemWorkspacePreferences.Icon = AppGlobals.Symbols.GetImage(AppSymbols.settings, SymbolSize.Small);
         MenuItemSaveWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.save, SymbolSize.Small);
         MenuItemNewWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.new_window, SymbolSize.Small);
         MenuItemRecentWorkspaces.Icon = AppGlobals.Symbols.GetImage(AppSymbols.time_machine, SymbolSize.Small);
-        ButtonUpdate.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done);
+        MenuItemUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.update_done, SymbolSize.Small);
-        ButtonTools.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.tools);
+        MenuItemTools.Icon = AppGlobals.Symbols.GetImage(AppSymbols.tools, SymbolSize.Small);
         MenuItemCreateUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.add, SymbolSize.Small);
         MenuItemRemoveUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.remove, SymbolSize.Small);
+        MenuItemAddAction.HeaderIcon = AppGlobals.Symbols.GetImage(AppSymbols.add, SymbolSize.Small);
+        MenuItemRemoveAction.HeaderIcon = AppGlobals.Symbols.GetImage(AppSymbols.remove, SymbolSize.Small);
         ImageUpdate.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done);
         ImageMetadata.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.show_property);
         ImageGeneral.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.normal_screen);
@@ -61,9 +59,7 @@ public partial class MainWindow : Window, IMainApi
             customClickHandler: MenuItemActionItem_Click,
             insertPrioSplitters: true);
         
-        var menuFlyoutTools = new MenuFlyout();
+        PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(MenuItemTools.Items,
-        ButtonTools.Flyout = menuFlyoutTools;
-        PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(menuFlyoutTools.Items,
             customClickHandler: MenuItemToolsItem_Click,
             insertPrioSplitters: true);
     }
@@ -120,14 +116,14 @@ public partial class MainWindow : Window, IMainApi
     private static void AddToRecentFiles(IWorkspace workspace)
     {
         var settings = Program.Settings.Get<WorkspaceSettings>();
-        settings.Workspaces.Remove(workspace.Config);
+        settings.Workspaces.RemoveAll(n => n == workspace.Config);
         settings.Workspaces.Insert(0, workspace.Config);
         settings.Workspaces.Skip(20).ForEach(n => settings.Workspaces.Remove(n));
     }
 
     private async void Window_OnLoaded(object? sender, RoutedEventArgs e)
     {
-        var updater = new AppUpdates("client", this)
+        var updater = new AppUpdates("manager", this)
         {
             UsePopups = true,
         };
@@ -205,7 +201,10 @@ public partial class MainWindow : Window, IMainApi
             Version = new(),
         };
         Model.CurrentWorkspace.UpdateInfos.Updates.Insert(0, update);
-        nodeUpdates.Nodes.Insert(0, new ActionSetTreeNode(update));
+        var item = new ActionSetTreeNode(update);
+        nodeUpdates.Nodes.Insert(0, item);
+        TreeViewWorkspace.SelectedItem = item;
+        TreeViewWorkspace.ScrollIntoView(item);
     }
 
     private void MenuItemRemoveUpdate_OnClick(object? sender, RoutedEventArgs e)
@@ -240,8 +239,11 @@ public partial class MainWindow : Window, IMainApi
             default:
                 return;
         }
-        
+
-        rows.List.Add(new MainWindowGridRow(action, rootInfos));
+        var row = new MainWindowGridRow(action, rootInfos);
+        rows.List.Add(row);
+        DataGridActions.SelectedItem = row;
+        DataGridActions.ScrollIntoView(row, null);
     }
 
     private void ButtonRemoveAction_OnClick(object? sender, RoutedEventArgs e)

ModpackUpdater.Apps.Manager/publish.sh

@@ -1,12 +0,0 @@
-pupnet -y -v "$1[1]" -r linux-x64 -k appimage
-#pupnet -y -v "$1[1]" -r linux-x64 -k flatpak -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-x64 -k deb -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-x64 -k rpm -p DefineConstants=DISABLE_UPDATE
-pupnet -y -v "$1[1]" -r linux-arm64 -k appimage
-#pupnet -y -v "$1[1]" -r linux-arm64 -k flatpak -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-arm64 -k deb -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -v "$1[1]"-r linux-arm64 -k rpm -p DefineConstants=DISABLE_UPDATE
-pupnet -y -v "$1[1]" -r win-x64 -k zip
-pupnet -y -v "$1[1]" -r win-arm64 -k zip
-pupnet -y -v "$1[1]" -r osx-x64 -k zip
-pupnet -y -v "$1[1]" -r osx-arm64 -k zip

ModpackUpdater.Apps/ModpackUpdater.Apps.csproj

@@ -19,17 +19,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pilz" Version="2.6.1" />
+    <PackageReference Include="Pilz" Version="2.6.2" />
     <PackageReference Include="Pilz.UI" Version="3.1.4" />
-    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.18" />
+    <PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.20" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
-    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
     <PackageReference Include="Avalonia.Svg" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8">
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.9">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>

ModpackUpdater.Manager/ModpackFactory.cs

@@ -12,7 +12,10 @@ public class ModpackFactory
     {
         Credentials = new Credentials("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"),
     };
-    private readonly ApiClient curseForge = new("$2a$10$pE4dD09gmr7IcOe8hjWhleWWjXopJcDNpq1P9FlrDMCBw05pCyAXa", "pilzinsel64@gmx.de");
+    private readonly ApiClient curseForge = new("$2a$10$pE4dD09gmr7IcOe8hjWhleWWjXopJcDNpq1P9FlrDMCBw05pCyAXa", "pilzinsel64@gmx.de")
+    {
+        RequestTimeout = new TimeSpan(0, 0, 30),
+    };
     private readonly ModrinthClient modrinth = new(new ModrinthClientConfig
     {
         ModrinthToken = "mrp_zUlDSET5actMUdTU3FK242TXgvlWgaErSSEFuegNG7thLgkC50IiK2NCGOzW",
@@ -70,7 +73,7 @@ public class ModpackFactory
                 {
                     var repo = await github.Repository.Get(action.SourceOwner, action.SourceName);
                     var releases = await github.Repository.Release.GetAll(repo.Id);
-                    return releases.Select(r => new ModVersionInfo(r.TagName, r.Name ?? r.TagName)).ToArray();
+                    return releases.Select(r => new ModVersionInfo(string.IsNullOrWhiteSpace(r.Name) ? r.TagName : r.Name, r.TagName)).ToArray();
                 }
                 catch
                 {

publish.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-for dir in ModpackUpdater.Apps.Client ModpackUpdater.Apps.Client.Gui ModpackUpdater.Apps.Manager; do
-  ( cd "$dir" && ./publish.sh "$1" )
-done
-
-# Remove artifacts
-rm -r publish/*/Artifacts*