introduce AsyncCommand for better handling of asynchronous operations

.github/workflows/dotnetcore.yml

@@ -10,10 +10,6 @@ jobs:
     - run: |
         git fetch --prune --unshallow
 
-    - name: Show environment
-      run: Get-Variable
-      shell: pwsh
-
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
@@ -37,8 +33,8 @@ jobs:
     - name: Test with OpenCover
       run: |
         .\CreateCoverReport.ps1
-        Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
-        bash codecov.sh -f "CoverOutput/coverage.xml" -t ${{ secrets.CODECOV_TOKEN }}
+        # Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
+        # bash codecov.sh -f "CoverOutput/coverage.xml" -t ${{ secrets.CODECOV_TOKEN }}
       shell: pwsh
     - name: Build Release
       run: dotnet build --configuration Release

PatchVersion.ps1

@@ -1,11 +1,18 @@
 # check whether build on tag
 $version = "DEVEL"
+
+Write-Host ref = $env:GITHUB_REF
 if ($env:GITHUB_REF -match "/tags/") {
   # use tag as version name
   $version = $env:GITHUB_REF -replace "(\w+/)*",""
 } else {
+  if ($env:GITHUB_REF -match "/heads/") {
+    # use branch as version name base
+    $version = $env:GITHUB_REF -replace "(\w+/)*",""
+  }
+
   # use git sha as version name
-  $version = ($env:GITHUB_SHA).Substring(0, 8)
+  $version = $version + "-" + ($env:GITHUB_SHA).Substring(0, 8)
 }
 
 Write-Host version = $version
@@ -17,4 +24,4 @@ $xml.Project.PropertyGroup.InformationalVersion = $version
 $utf8 = New-Object System.Text.UTF8Encoding($true)
 $sw = New-Object System.IO.StreamWriter($file.Fullname, $false, $utf8)
 $xml.Save( $sw )
-$sw.Close()
+$sw.Close()

src/SimpleAccounting/Presentation/IMessageBox.cs → src/SimpleAccounting/Abstractions/IMessageBox.cs

@@ -2,7 +2,7 @@
 //     Copyright (c) Lukas Grützmacher. All rights reserved.
 // </copyright>
 
-namespace lg2de.SimpleAccounting.Presentation
+namespace lg2de.SimpleAccounting.Abstractions
 {
     using System.Diagnostics.CodeAnalysis;
     using System.Windows;

src/SimpleAccounting/Abstractions/WindowsMessageBox.cs

@@ -0,0 +1,42 @@
+// <copyright>
+//     Copyright (c) Lukas Grützmacher. All rights reserved.
+// </copyright>
+
+namespace lg2de.SimpleAccounting.Abstractions
+{
+    using System.Diagnostics.CodeAnalysis;
+    using System.Windows;
+    using Caliburn.Micro;
+
+    /// <summary>
+    ///     Default implementation of <see cref="IMessageBox"/> using <see cref="MessageBox"/>.
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    internal class WindowsMessageBox : IMessageBox
+    {
+        public MessageBoxResult Show(
+            string messageBoxText,
+            string caption,
+            MessageBoxButton button = MessageBoxButton.OK,
+            MessageBoxImage icon = MessageBoxImage.None,
+            MessageBoxResult defaultResult = MessageBoxResult.None,
+            MessageBoxOptions options = MessageBoxOptions.None)
+        {
+            MessageBoxResult result = MessageBoxResult.None;
+            Execute.OnUIThread(
+                () =>
+                {
+                    Application.Current.MainWindow.Activate();
+                    result = MessageBox.Show(
+                        Application.Current.MainWindow,
+                        messageBoxText,
+                        caption,
+                        button,
+                        icon,
+                        defaultResult,
+                        options);
+                });
+            return result;
+        }
+    }
+}

src/SimpleAccounting/AppBootstrapper.cs

@@ -27,7 +27,7 @@ public AppBootstrapper()
             this.container.Singleton<IWindowManager, WindowManager>();
             this.container.Singleton<IReportFactory, ReportFactory>();
             this.container.Singleton<IApplicationUpdate, ApplicationUpdate>();
-            this.container.Singleton<IMessageBox, MessageBoxWrapper>();
+            this.container.Singleton<IMessageBox, WindowsMessageBox>();
             this.container.Singleton<IFileSystem, FileSystem>();
             this.container.Singleton<IProcess, DotNetProcess>();
             this.container.PerRequest<ShellViewModel>();

src/SimpleAccounting/Infrastructure/ApplicationUpdate.cs

@@ -14,7 +14,6 @@ namespace lg2de.SimpleAccounting.Infrastructure
     using System.Windows;
     using lg2de.SimpleAccounting.Abstractions;
     using lg2de.SimpleAccounting.Extensions;
-    using lg2de.SimpleAccounting.Presentation;
     using Octokit;
 
     [SuppressMessage(
@@ -106,20 +105,24 @@ internal bool AskForUpdate(IEnumerable<Release> releases, string currentVersion)
             Justification = "catch exceptions from external library")]
         private async Task<IEnumerable<Release>> GetAllReleasesAsync()
         {
-            try
-            {
-                var productInformation = new ProductHeaderValue(Defines.ProjectName);
-                var client = new GitHubClient(productInformation);
-                return await client.Repository.Release.GetAll(Defines.OrganizationName, Defines.ProjectName);
-            }
-            catch (Exception exception)
-            {
-                this.messageBox.Show(
-                    $"Abfrage neuer Versionen fehlgeschlagen:\n{exception.Message}",
-                    Caption,
-                    icon: MessageBoxImage.Error);
-                return Enumerable.Empty<Release>();
-            }
+            return await Task.Run(
+                async () =>
+                {
+                    try
+                    {
+                        var productInformation = new ProductHeaderValue(Defines.ProjectName);
+                        var client = new GitHubClient(productInformation);
+                        return await client.Repository.Release.GetAll(Defines.OrganizationName, Defines.ProjectName);
+                    }
+                    catch (Exception exception)
+                    {
+                        this.messageBox.Show(
+                            $"Abfrage neuer Versionen fehlgeschlagen:\n{exception.Message}",
+                            Caption,
+                            icon: MessageBoxImage.Error);
+                        return Enumerable.Empty<Release>();
+                    }
+                });
         }
     }
 }

src/SimpleAccounting/Infrastructure/AsyncCommand.cs

@@ -0,0 +1,52 @@
+// <copyright>
+//     Copyright (c) Lukas Grützmacher. All rights reserved.
+// </copyright>
+
+namespace lg2de.SimpleAccounting.Infrastructure
+{
+    using System;
+    using System.Threading.Tasks;
+    using System.Windows.Input;
+
+    public class AsyncCommand : IAsyncCommand
+    {
+        private readonly IBusy busy;
+        private readonly Func<Task> command;
+
+        public AsyncCommand(IBusy busy, Func<Task> command)
+        {
+            this.busy = busy;
+            this.command = command;
+        }
+
+        public event EventHandler CanExecuteChanged
+        {
+            add { CommandManager.RequerySuggested += value; }
+            remove { CommandManager.RequerySuggested -= value; }
+        }
+
+        public async void Execute(object parameter)
+        {
+            await this.ExecuteAsync(parameter);
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return true;
+        }
+
+        public async Task ExecuteAsync(object parameter)
+        {
+            this.busy.IsBusy = true;
+            RaiseCanExecuteChanged();
+            await this.command();
+            this.busy.IsBusy = false;
+            RaiseCanExecuteChanged();
+        }
+
+        private static void RaiseCanExecuteChanged()
+        {
+            CommandManager.InvalidateRequerySuggested();
+        }
+    }
+}

src/SimpleAccounting/Infrastructure/Defines.cs

@@ -15,5 +15,7 @@ internal static class Defines
 
         public static readonly string ProjectUrl = $"https://{GithubDomain}/{OrganizationName}/{ProjectName}";
         public static readonly string NewIssueUrl = $"{ProjectUrl}/issues/new?template=bug-report.md";
+
+        public static string GetAutoSaveFileName(string fileName) => fileName + "~";
     }
 }

src/SimpleAccounting/Infrastructure/IAsyncCommand.cs

@@ -0,0 +1,14 @@
+// <copyright>
+//     Copyright (c) Lukas Grützmacher. All rights reserved.
+// </copyright>
+
+namespace lg2de.SimpleAccounting.Infrastructure
+{
+    using System.Threading.Tasks;
+    using System.Windows.Input;
+
+    public interface IAsyncCommand : ICommand
+    {
+        Task ExecuteAsync(object parameter);
+    }
+}

src/SimpleAccounting/Infrastructure/IBusy.cs

@@ -0,0 +1,11 @@
+// <copyright>
+//     Copyright (c) Lukas Grützmacher. All rights reserved.
+// </copyright>
+
+namespace lg2de.SimpleAccounting.Infrastructure
+{
+    public interface IBusy
+    {
+        bool IsBusy { get; set; }
+    }
+}