diff --git a/.editorconfig b/.editorconfig index 644396b..83e04f2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1873,11 +1873,11 @@ resharper_arrange_method_or_operator_body_highlighting = hint resharper_arrange_null_checking_pattern_highlighting = suggestion resharper_enforce_do_while_statement_braces_highlighting = warning resharper_enforce_fixed_statement_braces_highlighting = warning -resharper_enforce_foreach_statement_braces_highlighting = suggestion -resharper_enforce_for_statement_braces_highlighting = suggestion -resharper_enforce_if_statement_braces_highlighting = suggestion +resharper_enforce_foreach_statement_braces_highlighting = none +resharper_enforce_for_statement_braces_highlighting = none +resharper_enforce_if_statement_braces_highlighting = none resharper_enforce_lock_statement_braces_highlighting = warning -resharper_enforce_while_statement_braces_highlighting = suggestion +resharper_enforce_while_statement_braces_highlighting = none resharper_remove_redundant_braces_highlighting = hint resharper_suggest_discard_declaration_var_style_highlighting = warning resharper_prefer_concrete_value_over_default_highlighting = hint \ No newline at end of file diff --git a/EllieHub/Features/AppWindow/Views/Windows/AppView.axaml.cs b/EllieHub/Features/AppWindow/Views/Windows/AppView.axaml.cs index b379fac..c5bda17 100644 --- a/EllieHub/Features/AppWindow/Views/Windows/AppView.axaml.cs +++ b/EllieHub/Features/AppWindow/Views/Windows/AppView.axaml.cs @@ -259,20 +259,14 @@ public partial class AppView : ReactiveWindow try { - Console.WriteLine("Downloading new updater..."); await _appResolver.InstallOrUpdateAsync(AppContext.BaseDirectory); + _appResolver.LaunchNewVersion(); } catch (Exception ex) { Console.WriteLine(ex); } - finally - { - Console.WriteLine("Launching new updater..."); - _appResolver.LaunchNewVersion(); - } - Console.WriteLine("Finished update, closing down..."); base.Close(); } diff --git a/EllieHub/Features/Home/Services/AppResolver.cs b/EllieHub/Features/Home/Services/AppResolver.cs index 950dbc5..8eff832 100644 --- a/EllieHub/Features/Home/Services/AppResolver.cs +++ b/EllieHub/Features/Home/Services/AppResolver.cs @@ -147,13 +147,12 @@ public sealed class AppResolver : IAppResolver // Move the new file to the application's directory. // ... - // This is a workaround for really weird bug with applications published as single-file, where + // This is a workaround for really weird bug with Unix applications published as single-file: // FileNotFoundException: Could not load file or assembly 'System.IO.Pipes, Version=9.0.0.0 [...] if (Environment.OSVersion.Platform is not PlatformID.Unix) File.Move(newFileUri, destinationUri, true); else { - // Circumvent this issue on Unix systems: https://github.com/dotnet/runtime/issues/31149 using var moveProcess = ToastieUtilities.StartProcess("mv", [newFileUri, destinationUri]); await moveProcess.WaitForExitAsync(cToken); }