V2025.11.3

Author: nlogozzo

.gitignore

@@ -381,7 +381,7 @@ MigrationBackup/
 FodyWeavers.xsd
 
 # VS Code files for those working on multiple tools
-.vscode/*
+.vscode/
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json

Nickvision.Desktop.Tests/ServiceCollectionTests.cs

@@ -66,8 +66,8 @@ public void Case003_Add()
     {
         Assert.IsNotNull(_collection);
         var service = new TestService();
-        Assert.IsTrue(_collection.Add<ITestService, TestService>(service));
-        Assert.IsFalse(_collection.Add<ITestService, TestService>(service));
+        Assert.IsTrue(_collection.Add<ITestService>(service));
+        Assert.IsFalse(_collection.Add<ITestService>(service));
         Assert.IsTrue(_collection.Has<ITestService>());
         Assert.IsFalse(service.Disposed);
     }
@@ -95,7 +95,7 @@ public void Case006_Dispose()
     {
         Assert.IsNotNull(_collection);
         var service = new TestService();
-        Assert.IsTrue(_collection.Add<ITestService, TestService>(service));
+        Assert.IsTrue(_collection.Add<ITestService>(service));
         Assert.IsFalse(service.Disposed);
         _collection.Dispose();
         _collection = null;

Nickvision.Desktop/Application/AppInfo.cs

@@ -54,7 +54,7 @@ public AppInfo(string id, string name, string englishShortName)
     /// <summary>
     ///     The current running version of the app.
     /// </summary>
-    public Version? Version { get; set; }
+    public AppVersion? Version { get; set; }
 
     /// <summary>
     ///     The changelog of the app in Markdown format.

Nickvision.Desktop/Application/AppVersion.cs

@@ -0,0 +1,99 @@
+using System;
+
+namespace Nickvision.Desktop.Application;
+
+public class AppVersion
+{
+    public AppVersion(string version)
+    {
+        var dashIndex = version.IndexOf('-');
+        version = version.TrimStart('v');
+        if (!Version.TryParse(dashIndex == -1 ? version : version[..dashIndex], out var baseVersion))
+        {
+            throw new ArgumentException("Invalid version format", nameof(version));
+        }
+        BaseVersion = baseVersion;
+        PreviewLabel = dashIndex == -1 ? string.Empty : version[(dashIndex + 1)..];
+    }
+
+    public AppVersion(Version version)
+    {
+        BaseVersion = version;
+        PreviewLabel = string.Empty;
+    }
+
+    public Version BaseVersion { get; init; }
+    public string PreviewLabel { get; init; }
+    
+    public bool IsPreview => !string.IsNullOrEmpty(PreviewLabel);
+
+    public static bool TryParse(string version, out AppVersion? appVersion)
+    {
+        appVersion = null;
+        try
+        {
+            appVersion = new AppVersion(version);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    public static bool operator <(AppVersion? pv1, AppVersion? pv2)
+    {
+        if (pv1?.BaseVersion < pv2?.BaseVersion)
+        {
+            return true;
+        }
+        else if (pv1?.BaseVersion == pv2?.BaseVersion)
+        {
+            return string.Compare(pv1?.PreviewLabel, pv2?.PreviewLabel, StringComparison.Ordinal) < 0;
+        }
+        return false;
+    }
+
+    public static bool operator <(AppVersion? pv, Version? v) => pv is null ? v is not null : pv.BaseVersion <= v;
+
+    public static bool operator >(AppVersion? pv1, AppVersion? pv2)
+    {
+        if (pv1 is null)
+        {
+            return pv2 is null;
+        }
+        if (pv1.BaseVersion > pv2?.BaseVersion)
+        {
+            return true;
+        }
+        if (pv1.BaseVersion == pv2?.BaseVersion)
+        {
+            return string.Compare(pv1.PreviewLabel, pv2?.PreviewLabel, StringComparison.Ordinal) > 0;
+        }
+        return false;
+    }
+
+    public static bool operator >(AppVersion? pv, Version? v) => pv is null ? v is null : pv.BaseVersion > v;
+
+    public static bool operator ==(AppVersion? pv1, AppVersion? pv2) => pv1 is null ? pv2 is null : pv1.BaseVersion == pv2?.BaseVersion && pv1.PreviewLabel == pv2?.PreviewLabel;
+
+    public static bool operator ==(AppVersion? pv, Version? v) => pv is null ? v is null : pv.BaseVersion == v && string.IsNullOrEmpty(pv.PreviewLabel);
+
+    public static bool operator !=(AppVersion? pv1, AppVersion? pv2) => !(pv1 == pv2);
+
+    public static bool operator !=(AppVersion? pv, Version? v) => !(pv == v);
+
+    public override bool Equals(object? obj)
+    {
+        return obj switch
+        {
+            AppVersion pv => this == pv,
+            Version v => this == v,
+            var _ => false
+        };
+    }
+
+    public override int GetHashCode() => ToString().GetHashCode();
+
+    public override string ToString() => $"{BaseVersion}-{PreviewLabel}";
+}

Nickvision.Desktop/Application/GitHubUpdaterService.cs

@@ -58,7 +58,7 @@ public GitHubUpdaterService(AppInfo appInfo, HttpClient httpClient)
     /// <param name="exactMatch">Whether the asset name should match exactly to the asset to download</param>
     /// <param name="progress">An optional progress reporter</param>
     /// <returns></returns>
-    public async Task<bool> DownloadReleaseAssetAsync(Version version,
+    public async Task<bool> DownloadReleaseAssetAsync(AppVersion version,
         string path,
         string assertName,
         bool exactMatch = true,
@@ -69,7 +69,7 @@ public async Task<bool> DownloadReleaseAssetAsync(Version version,
             var releases = await _githubClient.Repository.Release.GetAll(_owner, _name);
             foreach (var release in releases)
             {
-                if (!Version.TryParse(release.TagName.TrimStart('v'), out var releaseVersion))
+                if (!AppVersion.TryParse(release.TagName.TrimStart('v'), out var releaseVersion))
                 {
                     continue;
                 }
@@ -124,14 +124,14 @@ public async Task<bool> DownloadReleaseAssetAsync(Version version,
     ///     Gets the latest preview version available.
     /// </summary>
     /// <returns>The latest preview version or null if unavailable</returns>
-    public async Task<PreviewVersion?> GetLatestPreviewVersionAsync()
+    public async Task<AppVersion?> GetLatestPreviewVersionAsync()
     {
         try
         {
             var releases = await _githubClient.Repository.Release.GetAll(_owner, _name);
             foreach (var release in releases.Where(r => r.Prerelease && !r.Draft))
             {
-                if (!PreviewVersion.TryParse(release.TagName.TrimStart('v'), out var version))
+                if (!AppVersion.TryParse(release.TagName, out var version))
                 {
                     continue;
                 }
@@ -149,14 +149,14 @@ public async Task<bool> DownloadReleaseAssetAsync(Version version,
     ///     Gets the latest stable version available.
     /// </summary>
     /// <returns>The latest stable version or null if unavailable</returns>
-    public async Task<Version?> GetLatestStableVersionAsync()
+    public async Task<AppVersion?> GetLatestStableVersionAsync()
     {
         try
         {
             var releases = await _githubClient.Repository.Release.GetAll(_owner, _name);
             foreach (var release in releases.Where(r => !r.Prerelease && !r.Draft))
             {
-                if (!Version.TryParse(release.TagName.TrimStart('v'), out var version))
+                if (!AppVersion.TryParse(release.TagName, out var version))
                 {
                     continue;
                 }
@@ -176,7 +176,7 @@ public async Task<bool> DownloadReleaseAssetAsync(Version version,
     /// <param name="version">The released version</param>
     /// <param name="progress">An optional progress reporter</param>
     /// <returns>True if the update was downloaded and ran successfully, else false</returns>
-    public async Task<bool> WindowsUpdate(Version version, IProgress<DownloadProgress>? progress = null)
+    public async Task<bool> WindowsUpdate(AppVersion version, IProgress<DownloadProgress>? progress = null)
     {
         var setupPath = Path.Combine(UserDirectories.Cache, $"{_owner}_{_name}_Setup.exe");
         if (!await DownloadReleaseAssetAsync(version, setupPath, "setup.exe", false, progress))

Nickvision.Desktop/Application/IUpdaterService.cs

@@ -7,7 +7,7 @@ namespace Nickvision.Desktop.Application;
 /// <summary>
 ///     An interface of a service for updating an application.
 /// </summary>
-public interface IUpdaterService
+public interface IUpdaterService : IService
 {
     /// <summary>
     ///     Downloads an asset from a released version.
@@ -18,7 +18,7 @@ public interface IUpdaterService
     /// <param name="exactMatch">Whether the asset name should match exactly to the asset to download</param>
     /// <param name="progress">An optional progress reporter</param>
     /// <returns></returns>
-    Task<bool> DownloadReleaseAssetAsync(Version version,
+    Task<bool> DownloadReleaseAssetAsync(AppVersion version,
         string path,
         string assertName,
         bool exactMatch = true,
@@ -28,13 +28,13 @@ Task<bool> DownloadReleaseAssetAsync(Version version,
     ///     Gets the latest preview version available.
     /// </summary>
     /// <returns>The latest preview version or null if unavailable</returns>
-    Task<PreviewVersion?> GetLatestPreviewVersionAsync();
+    Task<AppVersion?> GetLatestPreviewVersionAsync();
 
     /// <summary>
     ///     Gets the latest stable version available.
     /// </summary>
     /// <returns>The latest stable version or null if unavailable</returns>
-    Task<Version?> GetLatestStableVersionAsync();
+    Task<AppVersion?> GetLatestStableVersionAsync();
 
 #if OS_WINDOWS
     /// <summary>
@@ -43,6 +43,6 @@ Task<bool> DownloadReleaseAssetAsync(Version version,
     /// <param name="version">The released version</param>
     /// <param name="progress">An optional progress reporter</param>
     /// <returns>True if the update was downloaded and ran successfully, else false</returns>
-    Task<bool> WindowsUpdate(Version version, IProgress<DownloadProgress>? progress = null);
+    Task<bool> WindowsUpdate(AppVersion version, IProgress<DownloadProgress>? progress = null);
 #endif
 }

Nickvision.Desktop/Application/PreviewVersion.cs

@@ -40,11 +40,10 @@ public void Dispose()
     /// <summary>
     ///     Adds a service to the collection.
     /// </summary>
-    /// <param name="implementation">The object of the service class</param>
+    /// <param name="implementation">The object of the service interface</param>
     /// <typeparam name="T">The service interface</typeparam>
-    /// <typeparam name="TU">The service class</typeparam>
     /// <returns></returns>
-    public bool Add<T, TU>(TU implementation) where T : IService where TU : class, T => _services.TryAdd(typeof(T), implementation);
+    public bool Add<T>(T implementation) where T : IService => _services.TryAdd(typeof(T), implementation);
 
     /// <summary>
     ///     Gets a service from the collection.

Nickvision.Desktop/Application/ServiceCollection.cs

@@ -1,4 +1,5 @@
-using System;
+using Nickvision.Desktop.Application;
+using System;
 using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -38,6 +39,17 @@ public JsonFileService(string directory)
         _directory = directory;
     }
 
+    /// <summary>
+    ///     Constructs a JsonFileService.
+    /// </summary>
+    /// <param name="appInfo">The AppInfo object for the app</param>
+    /// <remarks>If the environment variable "{AppInfo.Id}.portable" is set, the current working directory will be used. Else, a {AppInfo.Name} folder will be created and used inside the user's configuration directory.</remarks>
+    public JsonFileService(AppInfo appInfo) 
+        : this(Environment.GetEnvironmentVariable($"{appInfo.Id}.portable") is not null ? Directory.GetCurrentDirectory() : Path.Combine(UserDirectories.Config, appInfo.Name))
+    {
+        
+    }
+
     /// <summary>
     ///     Loads a json file and deserializes it into an object.
     /// </summary>

Nickvision.Desktop/Filesystem/JsonFileService.cs

@@ -8,7 +8,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
         <PackageId>Nickvision.Desktop</PackageId>
-        <Version>2025.11.2</Version>
+        <Version>2025.11.3</Version>
         <Company>Nickvision</Company>
         <Authors>Nickvision</Authors>
         <Description>A cross-platform base for Nickvision desktop applications.</Description>