docs/diff-tool.order.md

@@ -39,7 +39,7 @@ To change this file edit the source file and then run MarkdownSnippets.
 
 ### ViaEnvironment Variable
 
-Set an `DiffEngine_ToolOrder` environment variable with the preferred order of toll resolution. The value can be comma (`,`), pipe (`|`), or space separated.
+Set an `DiffEngine_ToolOrder` environment variable with the preferred order of tool resolution. The value can be comma (`,`), pipe (`|`), or space separated.
 
 For example `VisualStudio,Meld` will result in VisualStudio then Meld then all other tools being the order.
 

docs/mdsource/diff-tool.order.source.md

@@ -11,7 +11,7 @@ include: defaultOrder
 
 ### ViaEnvironment Variable
 
-Set an `DiffEngine_ToolOrder` environment variable with the preferred order of toll resolution. The value can be comma (`,`), pipe (`|`), or space separated.
+Set an `DiffEngine_ToolOrder` environment variable with the preferred order of tool resolution. The value can be comma (`,`), pipe (`|`), or space separated.
 
 For example `VisualStudio,Meld` will result in VisualStudio then Meld then all other tools being the order.
 

src/DiffEngine/BuildServerDetector.cs

@@ -6,83 +6,97 @@ public static class BuildServerDetector
 {
     static BuildServerDetector()
     {
-        // Appveyor
-        // https://www.appveyor.com/docs/environment-variables/
-        // Travis
-        // https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
-        if (string.Equals(Environment.GetEnvironmentVariable("CI"), "true", StringComparison.OrdinalIgnoreCase))
-        {
-            Detected = true;
-            return;
-        }
-
+        var variables = Environment.GetEnvironmentVariables();
         // Jenkins
         // https://wiki.jenkins.io/display/JENKINS/Building+a+software+project#Buildingasoftwareproject-belowJenkinsSetEnvironmentVariables
-        if (Environment.GetEnvironmentVariable("JENKINS_URL") != null)
-        {
-            Detected = true;
-            return;
-        }
+        IsJenkins = variables.Contains("JENKINS_URL");
 
         // GitHub Action
         // https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-environment-variables#default-environment-variables
-        if (Environment.GetEnvironmentVariable("GITHUB_ACTION") != null)
-        {
-            Detected = true;
-            return;
-        }
-
-        // AzureDevops
-        // https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#agent-variables
-        // Variable name is 'Agent.Id' to detect if this is a Azure Pipelines agent.
-        // Note that variables are upper-cased and '.' is replaced with '_' on Azure Pipelines.
-        // https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch#access-variables-through-the-environment
-        if (Environment.GetEnvironmentVariable("AGENT_ID") != null)
-        {
-            Detected = true;
-            return;
-        }
+        IsGithubAction = variables.Contains("GITHUB_ACTION");
 
         // TeamCity
         // https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#PredefinedBuildParameters-ServerBuildProperties
-        if (Environment.GetEnvironmentVariable("TEAMCITY_VERSION") != null)
-        {
-            Detected = true;
-            return;
-        }
+        IsTeamCity = variables.Contains("TEAMCITY_VERSION");
 
         // MyGet
         // https://docs.myget.org/docs/reference/build-services#Available_Environment_Variables
-        if (string.Equals(Environment.GetEnvironmentVariable("BuildRunner"), "MyGet", StringComparison.OrdinalIgnoreCase))
-        {
-            Detected = true;
-            return;
-        }
+        IsMyGet = ValueEquals(variables, "BuildRunner", "MyGet");
 
         // GitLab
         // https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
-        if (Environment.GetEnvironmentVariable("GITLAB_CI") != null)
-        {
-            Detected = true;
-            return;
-        }
+        IsGitLab = variables.Contains("GITLAB_CI");
+
+        // GoDC
+        // https://docs.gocd.org/current/faq/dev_use_current_revision_in_build.html
+        IsGoDc = variables.Contains("GO_SERVER_URL");
+
+        // Travis
+        // https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+        IsTravis = variables.Contains("TRAVIS_BUILD_ID");
 
         // Docker
         // https://www.hanselman.com/blog/detecting-that-a-net-core-app-is-running-in-a-docker-container-and-skippablefacts-in-xunit
-        if (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")
-        {
-            Detected = true;
-            return;
-        }
+        IsDocker = ValueEquals(variables, "DOTNET_RUNNING_IN_CONTAINER", "true");
 
-        // GoDC
-        // https://docs.gocd.org/current/faq/dev_use_current_revision_in_build.html
-        if (Environment.GetEnvironmentVariable("GO_SERVER_URL") != null)
+        // AppVeyor
+        // https://www.appveyor.com/docs/environment-variables/
+        IsAppVeyor = variables.Contains("APPVEYOR");
+
+        IsWsl = variables.Contains("WSLENV");
+
+        // AzureDevops
+        // https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#agent-variables
+        // Variable name is 'Agent.Id' to detect if this is a Azure Pipelines agent.
+        // Note that variables are upper-cased and '.' is replaced with '_' on Azure Pipelines.
+        // https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch#access-variables-through-the-environment
+        IsAzureDevops = ValueEquals(variables, "TF_BUILD", "True");
+
+        Detected = IsTravis ||
+                   IsJenkins ||
+                   IsGithubAction ||
+                   IsAzureDevops ||
+                   IsTeamCity ||
+                   IsGitLab ||
+                   IsMyGet ||
+                   IsGoDc ||
+                   IsDocker ||
+                   IsWsl ||
+                   IsAppVeyor;
+    }
+
+    static bool ValueEquals(IDictionary variables, string key, string value)
+    {
+        var variable = variables[key];
+        if(variable == null)
         {
-            Detected = true;
-            return;
+            return false;
         }
+
+        return string.Equals((string)variable, value, StringComparison.OrdinalIgnoreCase);
     }
 
+    public static bool IsWsl { get; }
+
+    public static bool IsAppVeyor { get; }
+
+    public static bool IsTravis { get; }
+
+    public static bool IsDocker { get; }
+
+    public static bool IsAzureDevops { get; }
+
+    public static bool IsGitLab { get; }
+
+    public static bool IsGoDc { get; }
+
+    public static bool IsMyGet { get; }
+
+    public static bool IsTeamCity { get; }
+
+    public static bool IsGithubAction { get; }
+
+    public static bool IsJenkins { get; }
+
     public static bool Detected { get; set; }
 }

src/DiffEngine/WildcardFileFinder.cs

@@ -6,7 +6,7 @@
         Path.AltDirectorySeparatorChar
     ];
 
-    static IEnumerable<string> EnumerateDirectories(string directory)
+    static List<string> EnumerateDirectories(string directory)
     {
         var expanded = Environment.ExpandEnvironmentVariables(directory);
         if (!directory.Contains('*'))

src/DiffEngineTray/GlobalUsings.cs

@@ -1,4 +1,2 @@
-// Global using directives
-
-global using System.ComponentModel;
+global using System.ComponentModel;
 global using Microsoft.Win32.SafeHandles;

src/DiffEngineTray/MenuBuilder.cs

@@ -28,7 +28,7 @@ public static ContextMenuStrip Build(Action exit, Action launchOptions, Tracker
         return menu;
     }
 
-    static IEnumerable<ToolStripItem> NonDefaultMenus(ToolStripItemCollection items) =>
+    static List<ToolStripItem> NonDefaultMenus(ToolStripItemCollection items) =>
         items
             .Cast<ToolStripItem>()
             .Where(_ => _.Text != "Exit" &&
@@ -162,7 +162,7 @@ static IEnumerable<ToolStripItem> BuildMovesAndDeletes(
         yield return new ToolStripSeparator();
     }
 
-    static ToolStripItem BuildDelete(TrackedDelete delete, Action accept)
+    static ToolStripDropDownButton BuildDelete(TrackedDelete delete, Action accept)
     {
         var menu = new ToolStripDropDownButton($"{delete.Name}")
         {
@@ -173,7 +173,7 @@ static ToolStripItem BuildDelete(TrackedDelete delete, Action accept)
         return menu;
     }
 
-    static ToolStripItem BuildMove(TrackedMove move, Action accept, Action discard)
+    static ToolStripDropDownButton BuildMove(TrackedMove move, Action accept, Action discard)
     {
         var tempName = Path.GetFileNameWithoutExtension(move.Temp);
         var targetName = Path.GetFileNameWithoutExtension(move.Target);

src/DiffEngineTray/Settings/OptionsFormLauncher.cs

@@ -53,7 +53,7 @@ static async Task<IReadOnlyCollection<string>> Save(KeyRegister keyRegister, Tra
         }
 
         await SettingsHelper.Write(settings);
-        return Array.Empty<string>();
+        return [];
     }
 
     static void AddHotKey(KeyRegister keyRegister, HotKey? hotKey, int id, Action action, List<string> saveErrors)

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>15.9.1</Version>
+    <Version>15.10.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
     <Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>

src/Directory.Packages.props

@@ -7,11 +7,11 @@
     <PackageVersion Include="Argon" Version="0.26.0" />
     <PackageVersion Include="Caseless.Fody" Version="1.9.1" />
     <PackageVersion Include="EmptyFiles" Version="8.7.1" />
-    <PackageVersion Include="Fody" Version="6.9.1" />
+    <PackageVersion Include="Fody" Version="6.9.2" />
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageVersion Include="Polyfill" Version="7.18.0" />
-    <PackageVersion Include="ProjectDefaults" Version="1.0.147" />
+    <PackageVersion Include="Polyfill" Version="7.21.0" />
+    <PackageVersion Include="ProjectDefaults" Version="1.0.148" />
     <PackageVersion Include="Resourcer.Fody" Version="1.8.1" />
     <PackageVersion Include="Serilog" Version="4.2.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
@@ -25,7 +25,7 @@
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <PackageVersion Include="Verify.ImageMagick" Version="3.6.0" />
     <PackageVersion Include="Verify.WinForms" Version="4.0.0" />
-    <PackageVersion Include="Verify.Xunit" Version="28.12.0" />
+    <PackageVersion Include="Verify.Xunit" Version="28.13.0" />
     <PackageVersion Include="Xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
     <PackageVersion Include="XunitContext" Version="3.3.2" />