1 files changed, 36 insertions, 8 deletions

diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
index f52dd5ee..e7acf71d 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
@@ -1,4 +1,5 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
+using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Toolkit.Serialization.Models
 {
@@ -9,13 +10,13 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         ** Accessors
         *********/
         /// <summary>The unique mod ID to require.</summary>
-        public string UniqueID { get; set; }
+        public string UniqueID { get; }
 
         /// <summary>The minimum required version (if any).</summary>
-        public ISemanticVersion MinimumVersion { get; set; }
+        public ISemanticVersion? MinimumVersion { get; }
 
         /// <summary>Whether the dependency must be installed to use the mod.</summary>
-        public bool IsRequired { get; set; }
+        public bool IsRequired { get; }
 
 
         /*********
@@ -26,12 +27,39 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         /// <param name="minimumVersion">The minimum required version (if any).</param>
         /// <param name="required">Whether the dependency must be installed to use the mod.</param>
         public ManifestDependency(string uniqueID, string minimumVersion, bool required = true)
+            : this(
+                uniqueID: uniqueID,
+                minimumVersion: !string.IsNullOrWhiteSpace(minimumVersion)
+                    ? new SemanticVersion(minimumVersion)
+                    : null,
+                required: required
+            )
+        { }
+
+        /// <summary>Construct an instance.</summary>
+        /// <param name="uniqueID">The unique mod ID to require.</param>
+        /// <param name="minimumVersion">The minimum required version (if any).</param>
+        /// <param name="required">Whether the dependency must be installed to use the mod.</param>
+        [JsonConstructor]
+        public ManifestDependency(string uniqueID, ISemanticVersion? minimumVersion, bool required = true)
         {
-            this.UniqueID = uniqueID;
-            this.MinimumVersion = !string.IsNullOrWhiteSpace(minimumVersion)
-                ? new SemanticVersion(minimumVersion)
-                : null;
+            this.UniqueID = this.NormalizeWhitespace(uniqueID);
+            this.MinimumVersion = minimumVersion;
             this.IsRequired = required;
         }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Normalize whitespace in a raw string.</summary>
+        /// <param name="input">The input to strip.</param>
+#if NET5_0_OR_GREATER
+        [return: NotNullIfNotNull("input")]
+#endif
+        private string? NormalizeWhitespace(string? input)
+        {
+            return input?.Trim();
+        }
     }
 }