From 4da9e954df3846d01aa0536f4e8143466a1d62f3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:49:49 -0500
Subject: use Array.Empty to avoid unneeded array allocations

---
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index 46b654a5..4ad97b6d 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
@@ -68,7 +69,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
             this.Description = description;
             this.Version = version;
             this.UniqueID = uniqueID;
-            this.UpdateKeys = new string[0];
+            this.UpdateKeys = Array.Empty<string>();
             this.ContentPackFor = new ManifestContentPackFor { UniqueID = contentPackFor };
         }
 
@@ -77,8 +78,8 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         [OnDeserialized]
         public void OnDeserialized(StreamingContext context)
         {
-            this.Dependencies ??= new IManifestDependency[0];
-            this.UpdateKeys ??= new string[0];
+            this.Dependencies ??= Array.Empty<IManifestDependency>();
+            this.UpdateKeys ??= Array.Empty<string>();
         }
     }
 }
-- 
cgit 


From 2e7c233f6c9bf6430672b39f970a3324deba79dd Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:48:55 -0400
Subject: enable nullable annotations by default (#837)

This adds `#nullable disable` to all existing code (except where null is impossible like enum files), so it can be migrated incrementally.
---
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs               | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs     | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index 4ad97b6d..a5dbf604 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
index 1eb80889..ea5f0e6c 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Serialization.Models
 {
     /// <summary>Indicates which mod can read the content pack represented by the containing manifest.</summary>
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
index 00f168f4..f52dd5ee 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Serialization.Models
 {
     /// <summary>A mod dependency listed in a mod manifest.</summary>
-- 
cgit 


From e58e8a22836081ec4baffa5a9b4b093a329f3d88 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 7 Apr 2022 01:38:02 -0400
Subject: enable nullable annotations for manifests (#837)

---
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs | 102 +++++++++++++++------
 .../Serialization/Models/ManifestContentPackFor.cs |  33 ++++++-
 .../Serialization/Models/ManifestDependency.cs     |  44 +++++++--
 3 files changed, 138 insertions(+), 41 deletions(-)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index a5dbf604..01010602 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -1,8 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 using StardewModdingAPI.Toolkit.Serialization.Converters;
 
@@ -15,48 +13,45 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         ** Accessors
         *********/
         /// <summary>The mod name.</summary>
-        public string Name { get; set; }
+        public string Name { get; }
 
         /// <summary>A brief description of the mod.</summary>
-        public string Description { get; set; }
+        public string Description { get; }
 
         /// <summary>The mod author's name.</summary>
-        public string Author { get; set; }
+        public string Author { get; }
 
         /// <summary>The mod version.</summary>
-        public ISemanticVersion Version { get; set; }
+        public ISemanticVersion Version { get; }
 
         /// <summary>The minimum SMAPI version required by this mod, if any.</summary>
-        public ISemanticVersion MinimumApiVersion { get; set; }
+        public ISemanticVersion? MinimumApiVersion { get; }
 
         /// <summary>The name of the DLL in the directory that has the <c>Entry</c> method. Mutually exclusive with <see cref="ContentPackFor"/>.</summary>
-        public string EntryDll { get; set; }
+        public string? EntryDll { get; }
 
         /// <summary>The mod which will read this as a content pack. Mutually exclusive with <see cref="Manifest.EntryDll"/>.</summary>
         [JsonConverter(typeof(ManifestContentPackForConverter))]
-        public IManifestContentPackFor ContentPackFor { get; set; }
+        public IManifestContentPackFor? ContentPackFor { get; }
 
         /// <summary>The other mods that must be loaded before this mod.</summary>
         [JsonConverter(typeof(ManifestDependencyArrayConverter))]
-        public IManifestDependency[] Dependencies { get; set; }
+        public IManifestDependency[] Dependencies { get; }
 
         /// <summary>The namespaced mod IDs to query for updates (like <c>Nexus:541</c>).</summary>
-        public string[] UpdateKeys { get; set; }
+        public string[] UpdateKeys { get; private set; }
 
         /// <summary>The unique mod ID.</summary>
-        public string UniqueID { get; set; }
+        public string UniqueID { get; }
 
         /// <summary>Any manifest fields which didn't match a valid field.</summary>
         [JsonExtensionData]
-        public IDictionary<string, object> ExtraFields { get; set; }
+        public IDictionary<string, object> ExtraFields { get; set; } = new Dictionary<string, object>();
 
 
         /*********
         ** Public methods
         *********/
-        /// <summary>Construct an instance.</summary>
-        public Manifest() { }
-
         /// <summary>Construct an instance for a transitional content pack.</summary>
         /// <param name="uniqueID">The unique mod ID.</param>
         /// <param name="name">The mod name.</param>
@@ -64,24 +59,71 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         /// <param name="description">A brief description of the mod.</param>
         /// <param name="version">The mod version.</param>
         /// <param name="contentPackFor">The modID which will read this as a content pack.</param>
-        public Manifest(string uniqueID, string name, string author, string description, ISemanticVersion version, string contentPackFor = null)
+        public Manifest(string uniqueID, string name, string author, string description, ISemanticVersion version, string? contentPackFor = null)
+            : this(
+                uniqueId: uniqueID,
+                name: name,
+                author: author,
+                description: description,
+                version: version,
+                minimumApiVersion: null,
+                entryDll: null,
+                contentPackFor: contentPackFor != null
+                    ? new ManifestContentPackFor(contentPackFor, null)
+                    : null,
+                dependencies: null,
+                updateKeys: null
+            )
+        { }
+
+        /// <summary>Construct an instance for a transitional content pack.</summary>
+        /// <param name="uniqueId">The unique mod ID.</param>
+        /// <param name="name">The mod name.</param>
+        /// <param name="author">The mod author's name.</param>
+        /// <param name="description">A brief description of the mod.</param>
+        /// <param name="version">The mod version.</param>
+        /// <param name="minimumApiVersion">The minimum SMAPI version required by this mod, if any.</param>
+        /// <param name="entryDll">The name of the DLL in the directory that has the <c>Entry</c> method. Mutually exclusive with <see cref="ContentPackFor"/>.</param>
+        /// <param name="contentPackFor">The modID which will read this as a content pack.</param>
+        /// <param name="dependencies">The other mods that must be loaded before this mod.</param>
+        /// <param name="updateKeys">The namespaced mod IDs to query for updates (like <c>Nexus:541</c>).</param>
+        [JsonConstructor]
+        public Manifest(string uniqueId, string name, string author, string description, ISemanticVersion version, ISemanticVersion? minimumApiVersion, string? entryDll, IManifestContentPackFor? contentPackFor, IManifestDependency[]? dependencies, string[]? updateKeys)
         {
-            this.Name = name;
-            this.Author = author;
-            this.Description = description;
+            this.UniqueID = this.NormalizeWhitespace(uniqueId);
+            this.Name = this.NormalizeWhitespace(name);
+            this.Author = this.NormalizeWhitespace(author);
+            this.Description = this.NormalizeWhitespace(description);
             this.Version = version;
-            this.UniqueID = uniqueID;
-            this.UpdateKeys = Array.Empty<string>();
-            this.ContentPackFor = new ManifestContentPackFor { UniqueID = contentPackFor };
+            this.MinimumApiVersion = minimumApiVersion;
+            this.EntryDll = this.NormalizeWhitespace(entryDll);
+            this.ContentPackFor = contentPackFor;
+            this.Dependencies = dependencies ?? Array.Empty<IManifestDependency>();
+            this.UpdateKeys = updateKeys ?? Array.Empty<string>();
+        }
+
+        /// <summary>Override the update keys loaded from the mod info.</summary>
+        /// <param name="updateKeys">The new update keys to set.</param>
+        internal void OverrideUpdateKeys(params string[] updateKeys)
+        {
+            this.UpdateKeys = updateKeys;
         }
 
-        /// <summary>Normalize the model after it's deserialized.</summary>
-        /// <param name="context">The deserialization context.</param>
-        [OnDeserialized]
-        public void OnDeserialized(StreamingContext context)
+
+        /*********
+        ** 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)
         {
-            this.Dependencies ??= Array.Empty<IManifestDependency>();
-            this.UpdateKeys ??= Array.Empty<string>();
+            return input
+                ?.Trim()
+                .Replace("\r", "")
+                .Replace("\n", "");
         }
     }
 }
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
index ea5f0e6c..f7dc8aa8 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Toolkit.Serialization.Models
 {
@@ -9,9 +9,36 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         ** Accessors
         *********/
         /// <summary>The unique ID of the mod which can read this content pack.</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; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="uniqueId">The unique ID of the mod which can read this content pack.</param>
+        /// <param name="minimumVersion">The minimum required version (if any).</param>
+        public ManifestContentPackFor(string uniqueId, ISemanticVersion? minimumVersion)
+        {
+            this.UniqueID = this.NormalizeWhitespace(uniqueId);
+            this.MinimumVersion = minimumVersion;
+        }
+
+
+        /*********
+        ** 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();
+        }
     }
 }
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();
+        }
     }
 }
-- 
cgit 


From 6b05296e71c32abd158f354eeeaf1e135e72e6e2 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 7 Apr 2022 01:51:50 -0400
Subject: migrate mod build package to .NET 5 to allow full nullable
 annotations (#837)

---
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs               | 2 --
 src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs | 2 --
 src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs     | 2 --
 3 files changed, 6 deletions(-)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index 01010602..3ab5edfb 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -115,9 +115,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         *********/
         /// <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
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
index f7dc8aa8..dcdbcf74 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
@@ -33,9 +33,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         *********/
         /// <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();
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
index e7acf71d..64725818 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
@@ -54,9 +54,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         *********/
         /// <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();
-- 
cgit 


From d706a25053cdc5d9f1ccc2c09dc3913f835c3f78 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 7 Apr 2022 02:33:23 -0400
Subject: enable nullable annotations for most of the SMAPI toolkit (#837)

---
 src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
index 64725818..5d1b73b1 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
@@ -26,7 +26,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         /// <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>
-        public ManifestDependency(string uniqueID, string minimumVersion, bool required = true)
+        public ManifestDependency(string uniqueID, string? minimumVersion, bool required = true)
             : this(
                 uniqueID: uniqueID,
                 minimumVersion: !string.IsNullOrWhiteSpace(minimumVersion)
-- 
cgit 


From 238045ba9c5937f684cad3c55a8f9b9c2733e45f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 7 Apr 2022 22:19:48 -0400
Subject: reverse mod build package migration to .NET 5 (#837)

The migrated package didn't work consistently in VIsual Studio, so this suppresses nullable annotations in .NET Standard instead.
---
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs               | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs     | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index 3ab5edfb..01010602 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -115,7 +115,9 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         *********/
         /// <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
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
index dcdbcf74..f7dc8aa8 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
@@ -33,7 +33,9 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         *********/
         /// <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();
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
index 5d1b73b1..fa254ea7 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
@@ -54,7 +54,9 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
         *********/
         /// <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();
-- 
cgit 


From 761f2d952b073b78a06453768992b7b0fd4c6463 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 10 Apr 2022 21:34:18 -0400
Subject: enable nullable annotations in mod data models (#837)

---
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.Toolkit/Serialization/Models')

diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index 01010602..da3ad608 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -46,7 +46,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models
 
         /// <summary>Any manifest fields which didn't match a valid field.</summary>
         [JsonExtensionData]
-        public IDictionary<string, object> ExtraFields { get; set; } = new Dictionary<string, object>();
+        public IDictionary<string, object> ExtraFields { get; } = new Dictionary<string, object>();
 
 
         /*********
-- 
cgit