feat: Visual Studio 2026 icon support

Author: massimopaganigh

src/Models/ExternalMerger.cs

@@ -34,7 +34,7 @@ static ExternalMerger()
                     new ExternalMerger("git", "Use Git Settings", "", "", ""),
                     new ExternalMerger("vscode", "Visual Studio Code", "Code.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger("vscode_insiders", "Visual Studio Code - Insiders", "Code - Insiders.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
-                    new ExternalMerger("vs", "Visual Studio", "vsDiffMerge.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m", "\"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger("vs17", "Visual Studio", "vsDiffMerge.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger("tortoise_merge", "Tortoise Merge", "TortoiseMerge.exe;TortoiseGitMerge.exe", "-base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\"", "-base:\"$LOCAL\" -theirs:\"$REMOTE\""),
                     new ExternalMerger("kdiff3", "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger("beyond_compare", "Beyond Compare", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),

src/Models/ExternalTool.cs

@@ -58,6 +58,21 @@ public class VisualStudioInstance
 
         [JsonPropertyName("isPrerelease")]
         public bool IsPrerelease { get; set; } = false;
+
+        [JsonPropertyName("installationVersion")]
+        public string InstallationVersion { get; set; } = string.Empty;
+
+        [JsonPropertyName("catalog")]
+        public VisualStudioCatalog Catalog { get; set; } = new();
+    }
+
+    public class VisualStudioCatalog
+    {
+        [JsonPropertyName("productLine")]
+        public string ProductLine { get; set; } = string.Empty;
+
+        [JsonIgnore]
+        public VisualStudioProductLine ParsedProductLine => Enum.TryParse<VisualStudioProductLine>(ProductLine, out var ppl) ? ppl : VisualStudioProductLine.Dev17;
     }
 
     public class JetBrainsState

src/Models/VisualStudioProductLine.cs

@@ -0,0 +1,14 @@
+namespace SourceGit.Models
+{
+    public enum VisualStudioProductLine
+    {
+        /// <summary>
+        /// Visual Studio 2022
+        /// </summary>
+        Dev17 = 17,
+        /// <summary>
+        /// Visual Studio 2026
+        /// </summary>
+        Dev18 = 18
+    }
+}

src/Native/Windows.cs

@@ -11,6 +11,7 @@
 using Avalonia.Controls;
 using Avalonia.Platform;
 using Avalonia.Threading;
+using SourceGit.Models;
 
 namespace SourceGit.Native
 {
@@ -404,7 +405,9 @@ private void FindVisualStudio(Models.ExternalToolsFinder finder)
                     foreach (var instance in instances)
                     {
                         var exec = instance.ProductPath;
-                        var icon = instance.IsPrerelease ? "vs-preview" : "vs";
+                        var productLine = instance.Catalog?.ParsedProductLine ?? VisualStudioProductLine.Dev17;
+                        var icon = instance.IsPrerelease ? $"vs{(int)productLine}-preview" : $"vs{(int)productLine}";
+                        
                         finder.TryAdd(instance.DisplayName, icon, () => exec, GenerateCommandlineArgsForVisualStudio);
                     }
                 }