Merge branch 'develop' into stable

3 files changed, 42 insertions, 3 deletions

diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
index be0c18ce..2636aae0 100644
--- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
@@ -90,10 +90,10 @@ namespace StardewModdingAPI.Toolkit.Framework
         }
 
         /// <summary>Get whether an executable is 64-bit.</summary>
-        /// <param name="executablePath">The absolute path to the executable file.</param>
-        public static bool Is64BitAssembly(string executablePath)
+        /// <param name="path">The absolute path to the assembly file.</param>
+        public static bool Is64BitAssembly(string path)
         {
-            return AssemblyName.GetAssemblyName(executablePath).ProcessorArchitecture != ProcessorArchitecture.X86;
+            return AssemblyName.GetAssemblyName(path).ProcessorArchitecture != ProcessorArchitecture.X86;
         }
 
 
diff --git a/src/SMAPI.Toolkit/SemanticVersionComparer.cs b/src/SMAPI.Toolkit/SemanticVersionComparer.cs
new file mode 100644
index 00000000..9f6b57a2
--- /dev/null
+++ b/src/SMAPI.Toolkit/SemanticVersionComparer.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace StardewModdingAPI.Toolkit
+{
+    /// <summary>A comparer for semantic versions based on the <see cref="SemanticVersion.CompareTo(ISemanticVersion)"/> field.</summary>
+    public class SemanticVersionComparer : IComparer<ISemanticVersion>
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>A singleton instance of the comparer.</summary>
+        public static SemanticVersionComparer Instance { get; } = new SemanticVersionComparer();
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <inheritdoc />
+        public int Compare(ISemanticVersion x, ISemanticVersion y)
+        {
+            if (object.ReferenceEquals(x, y))
+                return 0;
+
+            if (x is null)
+                return -1;
+            if (y is null)
+                return 1;
+
+            return x.CompareTo(y);
+        }
+    }
+}
diff --git a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
index 62bd13cd..6de79a85 100644
--- a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
@@ -46,5 +46,12 @@ namespace StardewModdingAPI.Toolkit.Utilities
         {
             return LowLevelEnvironmentUtility.GetExecutableName(platform.ToString());
         }
+
+        /// <summary>Get whether an executable is 64-bit.</summary>
+        /// <param name="path">The absolute path to the assembly file.</param>
+        public static bool Is64BitAssembly(string path)
+        {
+            return LowLevelEnvironmentUtility.Is64BitAssembly(path);
+        }
     }
 }