LITW-Refined/minecraft-modpack-updater
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix release build

Browse Source
This commit is contained in:
Pascal
2025-11-08 18:36:45 +01:00
parent 091d820332
commit a573f4fb89
2 changed files with 87 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
.idea/.idea.ModpackUpdater/.idea/workspace.xml generated
View File

@@ -7,18 +7,22 @@
<projectFile pubXmlPath="ModpackUpdater.Apps.Client/Properties/PublishProfiles/Windows.pubxml">ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj</projectFile>
<projectFile pubXmlPath="ModpackUpdater.Apps.Manager/Properties/PublishProfiles/FolderProfile.pubxml">ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj</projectFile>
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="5ade61e0-a306-402b-b785-019af99a33c8" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.ModpackUpdater/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.ModpackUpdater/.idea/avalonia.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ModpackUpdater.Manager/ModpackUpdater.Manager.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/ModpackUpdater.Manager/ModpackUpdater.Manager.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.ModpackUpdater/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.ModpackUpdater/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DpaMonitoringSettings">
<option name="firstShow" value="false" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@@ -38,6 +42,7 @@
&quot;second&quot;: &quot;7f2fcd6a-63d8-4d22-90ae-c2bb14a72d8d&quot;
}
}</component>
<component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 1
@@ -47,18 +52,25 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;master&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;RiderNuGetOptionsPageId&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
".NET Project.Apps\\ModpackUpdater.Apps.Client.Gui.executor": "Run",
"ModuleVcsDetector.initialDetectionPerformed": "true",
"Publish to IIS.ModpackUpdater.Apps.Client.Gui: Release.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
"RunOnceActivity.git.unshallow": "true",
"git-widget-placeholder": "master",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "RiderNuGetOptionsPageId",
"vue.rearranger.settings.migration": "true"
}
}</component>
<component name="RunManager" selected="Publish to IIS.ModpackUpdater.Apps.Client.Gui: Release">
}]]></component>
<component name="RunManager" selected=".NET Project.Apps\ModpackUpdater.Apps.Client.Gui">
<configuration name="ModpackUpdater.Apps.Client: Linux-arm64" type="DotNetMsBuildPublish" factoryName="Publish to IIS">
<riderPublish publish_profile="Linux-arm64.pubxml" pubxml_path="$PROJECT_DIR$/ModpackUpdater.Apps.Client/Properties/PublishProfiles/Linux-arm64.pubxml" uuid_high="4709208665819205069" uuid_low="-8313970087579639699" />
<method v="2" />
@@ -79,6 +91,34 @@
<riderPublish publish_profile="FolderProfile.pubxml" pubxml_path="$PROJECT_DIR$/ModpackUpdater.Apps.Manager/Properties/PublishProfiles/FolderProfile.pubxml" uuid_high="2484359349677343517" uuid_low="-5082670948160775998" />
<method v="2" />
</configuration>
<configuration name="Apps\ModpackUpdater.Apps.Client.Gui" type="DotNetProject" factoryName=".NET Project" temporary="true">
<option name="EXE_PATH" value="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/bin/Debug/net8.0/MinecraftModpackUpdater" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/bin/Debug/net8.0" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="ENV_FILE_PATHS" value="" />
<option name="REDIRECT_INPUT_PATH" value="" />
<option name="PTY_MODE" value="Auto" />
<option name="MIXED_MODE_DEBUG" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
<option name="PROJECT_KIND" value="DotNetCore" />
<option name="PROJECT_TFM" value="net8.0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue=".NET Project.Apps\ModpackUpdater.Apps.Client.Gui" />
</list>
</recent_temporary>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
@@ -88,15 +128,28 @@
<option name="presentableId" value="Default" />
<updated>1762620497034</updated>
<workItem from="1762620498776" duration="243000" />
<workItem from="1762622735596" duration="648000" />
</task>
<task id="LOCAL-00001" summary="fix build">
<option name="closed" value="true" />
<created>1762622947176</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1762622947176</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
<MESSAGE value="fix build" />
<option name="LAST_COMMIT_MESSAGE" value="fix build" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

26
ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
View File

@@ -7,10 +7,15 @@ using Avalonia.Platform.Storage;
using Avalonia.Threading;
using ModpackUpdater.Apps.Client.Gui.LangRes;
using ModpackUpdater.Manager;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using Pilz;
using Pilz.Extensions;
using Pilz.Runtime;
using Pilz.SymbolPacks.Sets;
using Pilz.UI.AvaloniaUI.Symbols;
using Pilz.UI.Symbols;
using Pilz.Updating.Client;
namespace ModpackUpdater.Apps.Client.Gui;
@@ -259,11 +264,11 @@ public partial class MainForm : Window
AppConfig.Instance.LastMinecraftProfilePath = TextBoxMinecraftProfileFolder.Text?.Trim();
}
private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
private async Task UpdateApp()
{
#if !DISABLE_UPDATE && !DEBUG
try
{
if (Debugger.IsAttached)
return;
var myAppPath = EnvironmentEx.ProcessPath!;
var updater = new UpdateClient(Program.UpdateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable)
{
@@ -285,10 +290,17 @@ public partial class MainForm : Window
}
IsEnabled = true;
}
}
catch (Exception ex)
}
private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
{
#if !DISABLE_UPDATE
try
{
await UpdateApp();
}
catch
{
await MessageBoxManager.GetMessageBoxStandard("error", ex.ToString(), ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Error).ShowWindowDialogAsync(this);
IsEnabled = true;
}
#endif