Stage v2.0.2 from dev to main

.github/scripts/coverage.ps1

@@ -5,7 +5,7 @@ try {
     Remove-Item -Path "SubathonManager.Tests\TestResults\*" -Recurse -Force -ErrorAction SilentlyContinue
     Remove-Item -Path "coverage-local" -Recurse -Force -ErrorAction SilentlyContinue
 
-    dotnet test SubathonManager.Tests\SubathonManager.Tests.csproj `
+    dotnet test --project SubathonManager.Tests\SubathonManager.Tests.csproj `
         --results-directory coverage-local `
         --coverage `
         --coverage-output-format cobertura `

.github/workflows/build.yml

@@ -321,7 +321,7 @@ jobs:
           -p:FileVersion=${{ steps.avars.outputs.file_version }}
           -p:AssemblyVersion=${{ steps.avars.outputs.file_version }}
           -p:InformationalVersion=${{ steps.avars.outputs.version }}
-          -p:Copyright="© 2025–${{ env.CopyrightYear }} WolfwithSword and contributors"
+          -p:Copyright="© 2025-${{ env.CopyrightYear }} WolfwithSword and contributors"
           -o build-avalonia
 
       - name: Copy presets, resources folder and license into build output
@@ -611,7 +611,7 @@ jobs:
               else
                 LINK="-"
               fi
-              echo "| \`${RUNTIME}\` | $(icon "$STATUS") | ${STORAGE:-–} | ${LINK} |"
+              echo "| \`${RUNTIME}\` | $(icon "$STATUS") | ${STORAGE:--} | ${LINK} |"
             done
             if [ "$found" -eq 0 ]; then
               echo "| - | no platform builds ran | - | - |"

.gitignore

@@ -30,6 +30,8 @@ presets/**
 !.idea/inspectionProfiles/
 !.idea/runConfigurations/
 
+*cobertura.xml
+
 resources/HONSE/*
 
 ## Ignore Visual Studio temporary files, build results, and
@@ -227,6 +229,7 @@ obj
 
 TestResults/
 coverage-report/
+coverage-local/
 
 # Stream Deck plugin packaging stuff
 *.streamDeckPlugin

SubathonManager.Core/AppServices.cs

@@ -1,128 +1,116 @@
-using Updatum;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using Microsoft.Extensions.Logging;
-namespace SubathonManager.Core {
-
-    public static class AppServices
-    {
-        public static IServiceProvider Provider { get; set; } = default!;
-
-        public static string AppVersion
-        {
-            get
-            {
-                var ver = Assembly.GetExecutingAssembly()
-                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
-                    .InformationalVersion ?? "dev";
-
-                var plusIndex = ver.IndexOf('+');
-                return plusIndex > 0 && ver.StartsWith('v') ? ver[..plusIndex] : ver;
-            }
-        }
+using Updatum;
+
+namespace SubathonManager.Core;
+
+public static class AppServices {
+    private static readonly UpdatumManager AppUpdater = new("WolfwithSword", "SubathonManager") {
+        AssetExtensionFilter = "zip",
+        CurrentVersion = GetVersion(),
+        FetchOnlyLatestRelease = true,
+        AssetRegexPattern = GetAssetRegexPattern()
+    };
 
-        private static readonly UpdatumManager AppUpdater = new("WolfwithSword", "SubathonManager")
-        {
-            AssetExtensionFilter = "zip",
-            CurrentVersion = GetVersion(),
-            FetchOnlyLatestRelease = true,
-            AssetRegexPattern = GetAssetRegexPattern(),
-        };
-
-        private static string GetAssetRegexPattern()
-        {
-            string rid =
-                OperatingSystem.IsWindows() ? "win-x64" :
-                OperatingSystem.IsLinux()   ? "linux-x64" :
-                OperatingSystem.IsMacOS()
-                    ? (RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "osx-arm64" : "osx-x64")
-                    : string.Empty;
-
-            return string.IsNullOrEmpty(rid) ? string.Empty : $@"(?i).*{rid}.*\.zip$";
+    public static IServiceProvider Provider { get; set; } = default!;
+
+    public static string AppVersion {
+        get {
+            string ver = Assembly.GetExecutingAssembly()
+                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
+                .InformationalVersion ?? "dev";
+
+            int plusIndex = ver.IndexOf('+');
+            return plusIndex > 0 && ver.StartsWith('v') ? ver[..plusIndex] : ver;
         }
+    }
 
-        private static Version GetVersion()
-        {
-            if (string.IsNullOrWhiteSpace(AppVersion))
-                throw new ArgumentException("Version string cannot be null or empty.", nameof(AppVersion));
+    private static string GetAssetRegexPattern() {
+        string rid =
+            OperatingSystem.IsWindows()
+                ? "win-x64"
+                : OperatingSystem.IsLinux()
+                    ? "linux-x64"
+                    : OperatingSystem.IsMacOS()
+                        ? RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "osx-arm64" : "osx-x64"
+                        : string.Empty;
+
+        return string.IsNullOrEmpty(rid) ? string.Empty : $@"(?i).*{rid}.*\.zip$";
+    }
+
+    private static Version GetVersion() {
+        if (string.IsNullOrWhiteSpace(AppVersion))
+            throw new ArgumentException("Version string cannot be null or empty.", nameof(AppVersion));
 
-            string input = AppVersion.Trim();
-            if (input.StartsWith("v", StringComparison.OrdinalIgnoreCase))
-                input = input.Substring(1);
+        string input = AppVersion.Trim();
+        if (input.StartsWith("v", StringComparison.OrdinalIgnoreCase))
+            input = input.Substring(1);
 
-            var parts = input.Split('.', StringSplitOptions.RemoveEmptyEntries);
+        string[] parts = input.Split('.', StringSplitOptions.RemoveEmptyEntries);
 
-            int major = parts.Length > 0 && int.TryParse(parts[0], out var m) ? m : 0;
-            int minor = parts.Length > 1 && int.TryParse(parts[1], out var n) ? n : 0;
-            int build = parts.Length > 2 && int.TryParse(parts[2], out var b) ? b : 0;
-            int revision = parts.Length > 3 && int.TryParse(parts[3], out var r) ? r : 0;
+        int major = parts.Length > 0 && int.TryParse(parts[0], out int m) ? m : 0;
+        int minor = parts.Length > 1 && int.TryParse(parts[1], out int n) ? n : 0;
+        int build = parts.Length > 2 && int.TryParse(parts[2], out int b) ? b : 0;
+        int revision = parts.Length > 3 && int.TryParse(parts[3], out int r) ? r : 0;
+
+        return new Version(major, minor, build, revision);
+    }
 
-            return new Version(major, minor, build, revision);
+    public static async Task<(bool, string?, string?)> CheckForUpdate(ILogger? logger) {
+        try {
+            bool updateFound = await AppUpdater.CheckForUpdatesAsync();
+            if (AppUpdater.LatestReleaseTagVersionStr == AppVersion) updateFound = false;
+            if (updateFound)
+                logger?.LogInformation(
+                    $"SubathonManager found an update ({AppUpdater.LatestReleaseTagVersionStr}) from current {AppVersion}." +
+                    $" Changelog: {AppUpdater.GetChangelog()}");
+            return (updateFound, AppUpdater.LatestReleaseTagVersionStr,
+                $"{AppUpdater.RepositoryUrl}/releases/{AppUpdater.LatestReleaseTagVersionStr}");
+        }
+        catch (Exception ex) {
+            logger?.LogWarning(ex, "Failed to check for updates");
         }
 
-        public static async Task<(bool, string?, string?)> CheckForUpdate(ILogger? logger)
-        {
-
-            try
-            {
-                bool updateFound = await AppUpdater.CheckForUpdatesAsync();
-                if (AppUpdater.LatestReleaseTagVersionStr == AppVersion) updateFound = false;
-                if (updateFound)
-                    logger?.LogInformation($"SubathonManager found an update ({AppUpdater.LatestReleaseTagVersionStr}) from current {AppVersion}." +
-                                           $" Changelog: {AppUpdater.GetChangelog()}");
-                return (updateFound, AppUpdater.LatestReleaseTagVersionStr, $"{AppUpdater.RepositoryUrl}/releases/{AppUpdater.LatestReleaseTagVersionStr}");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogWarning(ex, "Failed to check for updates");
+        return (false, null, null);
+    }
+
+    public static async Task<UpdatumDownloadedAsset?> DownloadUpdate(ILogger? logger) {
+        try {
+            UpdatumDownloadedAsset? downloads = await AppUpdater.DownloadUpdateAsync();
+            if (downloads == null) {
+                logger?.LogError("SubathonManager found an update but failed to download.");
+                return null;
             }
-            return (false, null, null);
+
+            return downloads;
+        }
+        catch (Exception ex) {
+            logger?.LogWarning(ex, "Failed to download update");
         }
 
-        public static async Task<UpdatumDownloadedAsset?> DownloadUpdate(ILogger? logger)
-        {
-            try
-            {
-                var downloads = await AppUpdater.DownloadUpdateAsync();
-                if (downloads == null)
-                {
-                    logger?.LogError($"SubathonManager found an update but failed to download.");
-                    return null;
-                }
+        return null;
+    }
 
-                return downloads;
+    [ExcludeFromCodeCoverage]
+    public static async Task<bool> InstallUpdate(UpdatumDownloadedAsset? asset, ILogger? logger) {
+        if (asset == null)
+            return false;
 
-            }
-            catch (Exception ex)
-            {
-                logger?.LogWarning(ex, "Failed to download update");
-            }
-            return null;
+        try {
+            await AppUpdater.InstallUpdateAsync(asset);
+            return true;
         }
-
-        [ExcludeFromCodeCoverage]
-        public static async Task<bool> InstallUpdate(UpdatumDownloadedAsset? asset, ILogger? logger)
-        {
-            if (asset == null)
-                return false;
-
-            try
-            {
-                await AppUpdater.InstallUpdateAsync(asset, true);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogWarning(ex, "Failed to install update");
-            }
-            return false;
+        catch (Exception ex) {
+            logger?.LogWarning(ex, "Failed to install update");
         }
 
-        public static async Task<bool> DownloadAndInstall(ILogger? logger)
-        {
-            var asset = await DownloadUpdate(logger);
-            return await InstallUpdate(asset, logger);
-        }
+        return false;
+    }
+
+    public static async Task<bool> DownloadAndInstall(ILogger? logger) {
+        UpdatumDownloadedAsset? asset = await DownloadUpdate(logger);
+        return await InstallUpdate(asset, logger);
     }
 }