Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
16b1a655aa
|
|||
|
12b5a63003
|
|||
|
035d2eeb9b
|
|||
|
eaaca4ddb8
|
|||
|
c1960abe3a
|
|||
|
cbd4b1c346
|
|||
|
db108fe36e
|
|||
|
bd8a08f03c
|
@@ -1,7 +1,7 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<ImplicitUsings>true</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
|
||||
@@ -12,7 +12,6 @@ public class AppConfig : ISettingsNode, ISettingsIdentifier
|
||||
[JsonProperty, Obsolete]
|
||||
private string? LastMinecraftProfilePath
|
||||
{
|
||||
get => RecentMinecraftProfilePaths.FirstOrDefault();
|
||||
set
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(value))
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -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="Avalonia" Version="11.3.8" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
|
||||
<PackageReference Include="Pilz.UI.AvaloniaUI" Version="1.2.20" />
|
||||
<PackageReference Include="Avalonia" Version="11.3.9" />
|
||||
<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.Fonts.Inter" Version="11.3.8" />
|
||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
|
||||
<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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
InstallWithoutGui(Options.UpdateOptions, Options.Silent);
|
||||
return;
|
||||
}
|
||||
|
||||
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)
|
||||
|
||||
@@ -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="NGitLab" Version="11.0.1" />
|
||||
<PackageReference Include="Pilz" Version="2.6.1" />
|
||||
<PackageReference Include="EPPlus" Version="8.3.1" />
|
||||
<PackageReference Include="NGitLab" Version="11.1.0" />
|
||||
<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.Desktop" Version="11.3.8" />
|
||||
<PackageReference Include="Avalonia" Version="11.3.9" />
|
||||
<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.Fonts.Inter" Version="11.3.8" />
|
||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
|
||||
<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>
|
||||
@@ -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"
|
||||
@@ -25,54 +24,44 @@
|
||||
ColumnSpacing="6"
|
||||
Margin="3">
|
||||
|
||||
<!-- StackPanel: Workspace -->
|
||||
<StackPanel
|
||||
<!-- Menu: Workspace -->
|
||||
<Menu
|
||||
Grid.Column="0"
|
||||
Grid.Row="0"
|
||||
Orientation="Horizontal">
|
||||
Grid.Row="0">
|
||||
|
||||
<!-- Button: Workspace -->
|
||||
<pilz:ImageButton
|
||||
x:Name="ButtonWorkspace"
|
||||
Text="{x:Static langRes:GeneralLangRes.Workspace}"
|
||||
Background="Transparent">
|
||||
<Menu.Items>
|
||||
<!-- MenuItem: Workspace -->
|
||||
<pilz:HeaderMenuItem
|
||||
x:Name="MenuItemWorkspace"
|
||||
HeaderText="{x:Static langRes:GeneralLangRes.Workspace}">
|
||||
|
||||
<pilz:ImageButton.Flyout>
|
||||
<MenuFlyout>
|
||||
<MenuFlyout.Items>
|
||||
<MenuItem x:Name="MenuItemWorkspacePreferences" Header="{x:Static langRes:GeneralLangRes.WorkspacePreferences}" Click="MenuItemWorkspacePreferences_OnClick"/>
|
||||
<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>
|
||||
<pilz:HeaderMenuItem.Items>
|
||||
<MenuItem x:Name="MenuItemWorkspacePreferences" Header="{x:Static langRes:GeneralLangRes.WorkspacePreferences}" Click="MenuItemWorkspacePreferences_OnClick"/>
|
||||
<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}"/>
|
||||
</pilz:HeaderMenuItem.Items>
|
||||
</pilz:HeaderMenuItem>
|
||||
|
||||
<!-- Button: Update -->
|
||||
<pilz:ImageButton
|
||||
x:Name="ButtonUpdate"
|
||||
Text="{x:Static langRes:GeneralLangRes.Update}"
|
||||
Background="Transparent">
|
||||
<!-- MenuItem: Update -->
|
||||
<pilz:HeaderMenuItem
|
||||
x:Name="MenuItemUpdate"
|
||||
HeaderText="{x:Static langRes:GeneralLangRes.Update}">
|
||||
|
||||
<pilz:ImageButton.Flyout>
|
||||
<MenuFlyout>
|
||||
<MenuFlyout.Items>
|
||||
<MenuItem x:Name="MenuItemCreateUpdate" Header="{x:Static langRes:GeneralLangRes.CreateUpdate}" Click="MenuItemCreateUpdate_OnClick"/>
|
||||
<MenuItem x:Name="MenuItemRemoveUpdate" Header="{x:Static langRes:GeneralLangRes.RemoveUpdate}" Click="MenuItemRemoveUpdate_OnClick"/>
|
||||
</MenuFlyout.Items>
|
||||
</MenuFlyout>
|
||||
</pilz:ImageButton.Flyout>
|
||||
</pilz:ImageButton>
|
||||
<pilz:HeaderMenuItem.Items>
|
||||
<MenuItem x:Name="MenuItemCreateUpdate" Header="{x:Static langRes:GeneralLangRes.CreateUpdate}" Click="MenuItemCreateUpdate_OnClick"/>
|
||||
<MenuItem x:Name="MenuItemRemoveUpdate" Header="{x:Static langRes:GeneralLangRes.RemoveUpdate}" Click="MenuItemRemoveUpdate_OnClick"/>
|
||||
</pilz:HeaderMenuItem.Items>
|
||||
</pilz:HeaderMenuItem>
|
||||
|
||||
<!-- Button: Tools -->
|
||||
<pilz:ImageButton
|
||||
x:Name="ButtonTools"
|
||||
Text="{x:Static langRes:GeneralLangRes.Tools}"
|
||||
Background="Transparent"/>
|
||||
</StackPanel>
|
||||
<!-- MenuItem: Workspace -->
|
||||
<pilz:HeaderMenuItem
|
||||
x:Name="MenuItemTools"
|
||||
HeaderText="{x:Static langRes:GeneralLangRes.Tools}"/>
|
||||
</Menu.Items>
|
||||
</Menu>
|
||||
|
||||
<!-- TreeView: Workspace -->
|
||||
<ScrollViewer
|
||||
@@ -82,6 +71,7 @@
|
||||
|
||||
<StackPanel>
|
||||
<TreeView
|
||||
x:Name="TreeViewWorkspace"
|
||||
ItemsSource="{Binding CurrentTreeNodes}"
|
||||
SelectedItem="{Binding SelectedTreeNode}">
|
||||
|
||||
@@ -109,26 +99,13 @@
|
||||
Orientation="Horizontal"
|
||||
VerticalAlignment="Center">
|
||||
|
||||
<!-- Panel: Menu list -->
|
||||
<StackPanel
|
||||
Orientation="Horizontal">
|
||||
|
||||
<!-- Button: Add action -->
|
||||
<pilz:ImageButton
|
||||
x:Name="ButtonAddAction"
|
||||
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>
|
||||
<!-- Menu: Actions -->
|
||||
<Menu>
|
||||
<Menu.Items>
|
||||
<pilz:HeaderMenuItem x:Name="MenuItemAddAction" HeaderText="{x:Static langRes:GeneralLangRes.Add}" Click="ButtonAddAction_OnClick"/>
|
||||
<pilz:HeaderMenuItem x:Name="MenuItemRemoveAction" HeaderText="{x:Static langRes:GeneralLangRes.Remove}" Click="ButtonRemoveAction_OnClick"/>
|
||||
</Menu.Items>
|
||||
</Menu>
|
||||
|
||||
<!-- TextBox: Search -->
|
||||
<TextBox
|
||||
@@ -138,8 +115,7 @@
|
||||
|
||||
<!-- Panel: Menu -->
|
||||
<ContentControl
|
||||
Content="{Binding SelectedTreeNode}"
|
||||
>
|
||||
Content="{Binding SelectedTreeNode}">
|
||||
|
||||
<ContentControl.DataTemplates>
|
||||
<DataTemplate
|
||||
|
||||
@@ -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);
|
||||
ButtonTools.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.tools);
|
||||
MenuItemUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.update_done, SymbolSize.Small);
|
||||
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();
|
||||
ButtonTools.Flyout = menuFlyoutTools;
|
||||
PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(menuFlyoutTools.Items,
|
||||
PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(MenuItemTools.Items,
|
||||
customClickHandler: MenuItemToolsItem_Click,
|
||||
insertPrioSplitters: true);
|
||||
}
|
||||
@@ -120,7 +116,7 @@ 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));
|
||||
}
|
||||
@@ -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)
|
||||
@@ -241,7 +240,10 @@ public partial class MainWindow : Window, IMainApi
|
||||
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)
|
||||
|
||||
@@ -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.Desktop" Version="11.3.8" />
|
||||
<PackageReference Include="Avalonia" Version="11.3.9" />
|
||||
<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.Fonts.Inter" Version="11.3.8" />
|
||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
|
||||
<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>
|
||||
|
||||
@@ -73,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.Name ?? r.TagName, r.TagName)).ToArray();
|
||||
return releases.Select(r => new ModVersionInfo(string.IsNullOrWhiteSpace(r.Name) ? r.TagName : r.Name, r.TagName)).ToArray();
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user