add full internal support for non-standard four-part versions

2 files changed, 38 insertions, 26 deletions

diff --git a/src/SMAPI/Framework/GameVersion.cs b/src/SMAPI/Framework/GameVersion.cs
index 29cfbc39..07957624 100644
--- a/src/SMAPI/Framework/GameVersion.cs
+++ b/src/SMAPI/Framework/GameVersion.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework
 {
-    /// <summary>An implementation of <see cref="ISemanticVersion"/> that correctly handles the non-semantic versions used by older Stardew Valley releases.</summary>
-    internal class GameVersion : SemanticVersion
+    /// <summary>An extension of <see cref="ISemanticVersion"/> that correctly handles non-semantic versions used by Stardew Valley.</summary>
+    internal class GameVersion : Toolkit.SemanticVersion
     {
         /*********
         ** Private methods
@@ -18,11 +18,11 @@ namespace StardewModdingAPI.Framework
             ["1.03"] = "1.0.3",
             ["1.04"] = "1.0.4",
             ["1.05"] = "1.0.5",
-            ["1.051"] = "1.0.6-prerelease1", // not a very good mapping, but good enough for SMAPI's purposes.
-            ["1.051b"] = "1.0.6-prerelease2",
+            ["1.051"] = "1.0.5.1",
+            ["1.051b"] = "1.0.5.2",
             ["1.06"] = "1.0.6",
             ["1.07"] = "1.0.7",
-            ["1.07a"] = "1.0.8-prerelease1",
+            ["1.07a"] = "1.0.7.1",
             ["1.08"] = "1.0.8",
             ["1.1"] = "1.1.0",
             ["1.2"] = "1.2.0",
@@ -36,7 +36,7 @@ namespace StardewModdingAPI.Framework
         /// <summary>Construct an instance.</summary>
         /// <param name="version">The game version string.</param>
         public GameVersion(string version)
-            : base(GameVersion.GetSemanticVersionString(version)) { }
+            : base(GameVersion.GetSemanticVersionString(version), allowNonStandard: true) { }
 
         /// <summary>Get a string representation of the version.</summary>
         public override string ToString()
@@ -53,33 +53,21 @@ namespace StardewModdingAPI.Framework
         private static string GetSemanticVersionString(string gameVersion)
         {
             // mapped version
-            if (GameVersion.VersionMap.TryGetValue(gameVersion, out string semanticVersion))
-                return semanticVersion;
-
-            // special case: four-part versions
-            string[] parts = gameVersion.Split('.');
-            if (parts.Length == 4)
-                return $"{parts[0]}.{parts[1]}.{parts[2]}+{parts[3]}";
-
-            return gameVersion;
+            return GameVersion.VersionMap.TryGetValue(gameVersion, out string semanticVersion)
+                ? semanticVersion
+                : gameVersion;
         }
 
         /// <summary>Convert a semantic version string to the equivalent game version string.</summary>
         /// <param name="semanticVersion">The semantic version string.</param>
         private static string GetGameVersionString(string semanticVersion)
         {
-            // mapped versions
             foreach (var mapping in GameVersion.VersionMap)
             {
                 if (mapping.Value.Equals(semanticVersion, StringComparison.InvariantCultureIgnoreCase))
                     return mapping.Key;
             }
 
-            // special case: four-part versions
-            string[] parts = semanticVersion.Split('.', '+');
-            if (parts.Length == 4)
-                return $"{parts[0]}.{parts[1]}.{parts[2]}.{parts[3]}";
-
             return semanticVersion;
         }
     }
diff --git a/src/SMAPI/SemanticVersion.cs b/src/SMAPI/SemanticVersion.cs
index 2a33ecef..4a175efe 100644
--- a/src/SMAPI/SemanticVersion.cs
+++ b/src/SMAPI/SemanticVersion.cs
@@ -39,18 +39,36 @@ namespace StardewModdingAPI
         /// <param name="majorVersion">The major version incremented for major API changes.</param>
         /// <param name="minorVersion">The minor version incremented for backwards-compatible changes.</param>
         /// <param name="patchVersion">The patch version for backwards-compatible bug fixes.</param>
-        /// <param name="prerelease">An optional prerelease tag.</param>
-        /// <param name="build">Optional build metadata. This is ignored when determining version precedence.</param>
+        /// <param name="prereleaseTag">An optional prerelease tag.</param>
+        /// <param name="buildMetadata">Optional build metadata. This is ignored when determining version precedence.</param>
+        public SemanticVersion(int majorVersion, int minorVersion, int patchVersion, string prereleaseTag = null, string buildMetadata = null)
+            : this(majorVersion, minorVersion, patchVersion, 0, prereleaseTag, buildMetadata) { }
+
+        /// <summary>Construct an instance.</summary>
+        /// <param name="majorVersion">The major version incremented for major API changes.</param>
+        /// <param name="minorVersion">The minor version incremented for backwards-compatible changes.</param>
+        /// <param name="patchVersion">The patch version for backwards-compatible bug fixes.</param>
+        /// <param name="prereleaseTag">An optional prerelease tag.</param>
+        /// <param name="platformRelease">The platform-specific version (if applicable).</param>
+        /// <param name="buildMetadata">Optional build metadata. This is ignored when determining version precedence.</param>
         [JsonConstructor]
-        public SemanticVersion(int majorVersion, int minorVersion, int patchVersion, string prerelease = null, string build = null)
-            : this(new Toolkit.SemanticVersion(majorVersion, minorVersion, patchVersion, prerelease, build)) { }
+        internal SemanticVersion(int majorVersion, int minorVersion, int patchVersion, int platformRelease, string prereleaseTag = null, string buildMetadata = null)
+            : this(new Toolkit.SemanticVersion(majorVersion, minorVersion, patchVersion, platformRelease, prereleaseTag, buildMetadata)) { }
 
         /// <summary>Construct an instance.</summary>
         /// <param name="version">The semantic version string.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="version"/> is null.</exception>
         /// <exception cref="FormatException">The <paramref name="version"/> is not a valid semantic version.</exception>
         public SemanticVersion(string version)
-            : this(new Toolkit.SemanticVersion(version)) { }
+            : this(version, allowNonStandard: false) { }
+
+        /// <summary>Construct an instance.</summary>
+        /// <param name="version">The semantic version string.</param>
+        /// <param name="allowNonStandard">Whether to recognize non-standard semver extensions.</param>
+        /// <exception cref="ArgumentNullException">The <paramref name="version"/> is null.</exception>
+        /// <exception cref="FormatException">The <paramref name="version"/> is not a valid semantic version.</exception>
+        internal SemanticVersion(string version, bool allowNonStandard)
+            : this(new Toolkit.SemanticVersion(version, allowNonStandard)) { }
 
         /// <summary>Construct an instance.</summary>
         /// <param name="version">The assembly version.</param>
@@ -141,6 +159,12 @@ namespace StardewModdingAPI
             return this.Version.ToString();
         }
 
+        /// <summary>Whether the version uses non-standard extensions, like four-part game versions on some platforms.</summary>
+        public bool IsNonStandard()
+        {
+            return this.Version.IsNonStandard();
+        }
+
         /// <summary>Parse a version string without throwing an exception if it fails.</summary>
         /// <param name="version">The version string.</param>
         /// <param name="parsed">The parsed representation.</param>