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/Framework/Clients/WebApi/ModEntryModel.cs           | 4 +++-
 .../Framework/Clients/WebApi/ModExtendedMetadataModel.cs              | 3 ++-
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs     | 4 +++-
 src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs          | 2 +-
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs                | 2 +-
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs     | 4 +++-
 src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs                    | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
index 2f58a3f1..0115fbf3 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
 {
     /// <summary>Metadata about a mod.</summary>
@@ -16,6 +18,6 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         public ModExtendedMetadataModel Metadata { get; set; }
 
         /// <summary>The errors that occurred while fetching update data.</summary>
-        public string[] Errors { get; set; } = new string[0];
+        public string[] Errors { get; set; } = Array.Empty<string>();
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
index 5c2ce366..0fa4a74d 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
@@ -17,7 +18,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         ** Mod info
         ****/
         /// <summary>The mod's unique ID. A mod may have multiple current IDs in rare cases (e.g. due to parallel releases or unofficial updates).</summary>
-        public string[] ID { get; set; } = new string[0];
+        public string[] ID { get; set; } = Array.Empty<string>();
 
         /// <summary>The mod's display name.</summary>
         public string Name { get; set; }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
index bf81e102..404d4618 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
 {
     /// <summary>Specifies the identifiers for a mod to match.</summary>
@@ -37,7 +39,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         {
             this.ID = id;
             this.InstalledVersion = installedVersion;
-            this.UpdateKeys = updateKeys ?? new string[0];
+            this.UpdateKeys = updateKeys ?? Array.Empty<string>();
         }
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
index f1feb44b..2ed255c8 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
@@ -179,7 +179,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
                 errors = rawErrors.ToArray();
             }
             else
-                errors = new string[0];
+                errors = Array.Empty<string>();
 
             // build model
             return new ChangeDescriptor(
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index f85e82e1..0f5a0ec3 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -239,7 +239,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
             string raw = this.GetAttribute(element, name);
             return !string.IsNullOrWhiteSpace(raw)
                 ? raw.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(p => p.Trim()).ToArray()
-                : new string[0];
+                : Array.Empty<string>();
         }
 
         /// <summary>Get an attribute value and parse it as an enum value.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
index 0587e09d..03c0d214 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
@@ -1,3 +1,5 @@
+using System;
+
 #nullable enable
 
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
@@ -9,7 +11,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
         ** Accessors
         *********/
         /// <summary>The unique mod IDs for the mods to override.</summary>
-        public string[] Ids { get; set; } = new string[0];
+        public string[] Ids { get; set; } = Array.Empty<string>();
 
         /// <summary>Maps local versions to a semantic version for update checks.</summary>
         public ChangeDescriptor? ChangeLocalVersions { get; set; }
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
index a9da884a..5b7e2a02 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         *********/
         /// <summary>Construct an empty instance.</summary>
         public ModDatabase()
-        : this(new ModDataRecord[0], key => null) { }
+        : this(Array.Empty<ModDataRecord>(), key => null) { }
 
         /// <summary>Construct an instance.</summary>
         /// <param name="records">The underlying mod data records indexed by default display name.</param>
-- 
cgit 


From a593eda30f82af474887d91458b0e9158f66fefc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:24:59 -0400
Subject: use target-typed new

---
 src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs |  4 ++--
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs     |  2 +-
 src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs    |  4 ++--
 src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs  |  2 +-
 src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs       |  2 +-
 src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs      | 12 ++++++------
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
index c2d906a0..f7d26d21 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
@@ -62,9 +62,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         private TResult Post<TBody, TResult>(string url, TBody content)
         {
             // note: avoid HttpClient for macOS compatibility
-            using WebClient client = new WebClient();
+            using WebClient client = new();
 
-            Uri fullUrl = new Uri(this.BaseUrl, url);
+            Uri fullUrl = new(this.BaseUrl, url);
             string data = JsonConvert.SerializeObject(content);
 
             client.Headers["Content-Type"] = "application/json";
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index 0f5a0ec3..abbcdc81 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -127,7 +127,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
                 string pullRequestUrl = this.GetAttribute(node, "data-pr");
 
                 // parse stable compatibility
-                WikiCompatibilityInfo compatibility = new WikiCompatibilityInfo
+                WikiCompatibilityInfo compatibility = new()
                 {
                     Status = this.GetAttributeAsEnum<WikiCompatibilityStatus>(node, "data-status") ?? WikiCompatibilityStatus.Ok,
                     BrokeIn = this.GetAttribute(node, "data-broke-in"),
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 8d4198de..768beba1 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -45,7 +45,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
             // yield valid folders
             foreach (string path in paths)
             {
-                DirectoryInfo folder = new DirectoryInfo(path);
+                DirectoryInfo folder = new(path);
                 if (this.LooksLikeGameFolder(folder))
                     yield return folder;
             }
@@ -191,7 +191,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                 yield break;
 
             // get targets file
-            FileInfo file = new FileInfo(Path.Combine(homePath, "stardewvalley.targets"));
+            FileInfo file = new(Path.Combine(homePath, "stardewvalley.targets"));
             if (!file.Exists)
                 yield break;
 
diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
index 8b6eb5fb..c0332331 100644
--- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
@@ -98,7 +98,7 @@ namespace StardewModdingAPI.Toolkit.Framework
         /// </remarks>
         private static bool IsRunningAndroid()
         {
-            using Process process = new Process
+            using Process process = new()
             {
                 StartInfo =
                 {
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index 5dd32acf..7e07ffde 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -82,7 +82,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <param name="manifest">The manifest to match.</param>
         public ModDataRecordVersionedFields GetVersionedFields(IManifest manifest)
         {
-            ModDataRecordVersionedFields parsed = new ModDataRecordVersionedFields { DisplayName = this.DisplayName, DataRecord = this };
+            ModDataRecordVersionedFields parsed = new() { DisplayName = this.DisplayName, DataRecord = this };
             foreach (ModDataField field in this.Fields.Where(field => field.IsMatch(manifest)))
             {
                 switch (field.Key)
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index e6105f9c..d21ccec0 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -18,7 +18,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         private readonly JsonHelper JsonHelper;
 
         /// <summary>A list of filesystem entry names to ignore when checking whether a folder should be treated as a mod.</summary>
-        private readonly HashSet<Regex> IgnoreFilesystemNames = new HashSet<Regex>
+        private readonly HashSet<Regex> IgnoreFilesystemNames = new()
         {
             new Regex(@"^__folder_managed_by_vortex$", RegexOptions.Compiled | RegexOptions.IgnoreCase), // Vortex mod manager
             new Regex(@"(?:^\._|^\.DS_Store$|^__MACOSX$|^mcs$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), // macOS
@@ -26,7 +26,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>A list of file extensions to ignore when searching for mod files.</summary>
-        private readonly HashSet<string> IgnoreFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> IgnoreFileExtensions = new(StringComparer.OrdinalIgnoreCase)
         {
             // text
             ".doc",
@@ -60,7 +60,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>The extensions for packed content files.</summary>
-        private readonly HashSet<string> StrictXnbModExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> StrictXnbModExtensions = new(StringComparer.OrdinalIgnoreCase)
         {
             ".xgs",
             ".xnb",
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>The extensions for files which an XNB mod may contain, in addition to <see cref="StrictXnbModExtensions"/>.</summary>
-        private readonly HashSet<string> PotentialXnbModExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> PotentialXnbModExtensions = new(StringComparer.OrdinalIgnoreCase)
         {
             ".json",
             ".yaml"
@@ -96,7 +96,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         /// <param name="rootPath">The root folder containing mods.</param>
         public IEnumerable<ModFolder> GetModFolders(string rootPath)
         {
-            DirectoryInfo root = new DirectoryInfo(rootPath);
+            DirectoryInfo root = new(rootPath);
             return this.GetModFolders(root, root);
         }
 
@@ -260,7 +260,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             while (true)
             {
                 // check for manifest in current folder
-                FileInfo file = new FileInfo(Path.Combine(folder.FullName, "manifest.json"));
+                FileInfo file = new(Path.Combine(folder.FullName, "manifest.json"));
                 if (file.Exists)
                     return file;
 
-- 
cgit 


From 0539bb8f3705e5c50d0e5790e2af97f39aed04b8 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:25:00 -0400
Subject: simplify with newer pattern features

---
 src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index d21ccec0..e16af3a8 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -137,7 +137,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
                     return new ModFolder(root, searchFolder, ModType.Xnb, null, ModParseError.XnbMod, "it's not a SMAPI mod (see https://smapi.io/xnb for info).");
 
                 // SMAPI installer
-                if (relevantFiles.Any(p => p.Name == "install on Linux.sh" || p.Name == "install on macOS.command" || p.Name == "install on Windows.bat"))
+                if (relevantFiles.Any(p => p.Name is "install on Linux.sh" or "install on macOS.command" or "install on Windows.bat"))
                     return new ModFolder(root, searchFolder, ModType.Invalid, null, ModParseError.ManifestMissing, "the SMAPI installer isn't a mod (you can delete this folder after running the installer file).");
 
                 // not a mod?
-- 
cgit 


From 077d8e4f401ad1806c6af0540f432366314a2300 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:25:00 -0400
Subject: remove some unused/redundant code

---
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs | 2 +-
 src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index abbcdc81..c936bb3e 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -65,7 +65,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 
                 foreach (var entry in this.ParseOverrideEntries(modNodes))
                 {
-                    if (entry.Ids?.Any() != true || !entry.HasChanges)
+                    if (entry.Ids.Any() != true || !entry.HasChanges)
                         continue;
 
                     foreach (string id in entry.Ids)
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
index 5b7e2a02..9bb3f558 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         *********/
         /// <summary>Construct an empty instance.</summary>
         public ModDatabase()
-        : this(Array.Empty<ModDataRecord>(), key => null) { }
+        : this(Array.Empty<ModDataRecord>(), _ => null) { }
 
         /// <summary>Construct an instance.</summary>
         /// <param name="records">The underlying mod data records indexed by default display name.</param>
-- 
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/Framework/Clients/WebApi/ModEntryModel.cs            | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs     | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs      | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs           | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs             | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs           | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs                 | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs      | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs    | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs      | 2 --
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs               | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/Constants.cs                               | 2 ++
 src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs              | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs                   | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs                    | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs                    | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs                   | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs    | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs                     | 2 ++
 src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs                   | 2 ++
 src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs                  | 2 ++
 src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs                   | 2 ++
 src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs                    | 2 ++
 26 files changed, 50 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
index 0115fbf3..d5ca2034 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs
index 188db31d..9aac7fd3 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 using StardewModdingAPI.Toolkit.Serialization.Converters;
 
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
index 0fa4a74d..eb54ec78 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
index 404d4618..8fe8fa2a 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs
index 73698173..393391f7 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 using StardewModdingAPI.Toolkit.Utilities;
 
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
index f7d26d21..56acb768 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
index 2ed255c8..910bf793 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index c936bb3e..86c3bd75 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs
index 204acd2b..30e76d04 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>Compatibility info for a mod.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
index 5cdf489f..2c222b71 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>The compatibility status for a mod.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
index 03c0d214..a6f5a88f 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
@@ -1,7 +1,5 @@
 using System;
 
-#nullable enable
-
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>The data overrides to apply to matching mods.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
index 4e0104da..91943ff9 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>A mod entry in the wiki list.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs
index 0d614f28..1787197a 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>Metadata from the wiki's mod compatibility list.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Constants.cs b/src/SMAPI.Toolkit/Framework/Constants.cs
index 55f26582..c3a787c7 100644
--- a/src/SMAPI.Toolkit/Framework/Constants.cs
+++ b/src/SMAPI.Toolkit/Framework/Constants.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework
 {
     /// <summary>Contains the SMAPI installer's constants and assumptions.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 768beba1..ac6fe411 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
index c0332331..9998edec 100644
--- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
index ef6d4dd9..3fa70615 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Toolkit.Framework.ModData
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
index b02be3e4..46cb81e1 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 
 namespace StardewModdingAPI.Toolkit.Framework.ModData
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
index 2167d3e5..4d96a555 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index 7e07ffde..4c09e1ba 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
index 5aaabd51..b599b343 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.ModData
 {
     /// <summary>The versioned fields from a <see cref="ModDataRecord"/> for a specific manifest.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
index 9bb3f558..a5237334 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
index 825b98e5..81d72c0b 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index e16af3a8..4deaf19b 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
index 489e1c4d..57eea2f7 100644
--- a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
+++ b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework
 {
     /// <summary>Reads strings into a semantic version.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
index 077c0361..ec94ed51 100644
--- a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
+++ b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Framework.UpdateData
-- 
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/Framework/ModScanning/ModScanner.cs | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index 4deaf19b..621f1e28 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -171,14 +171,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
                 }
             }
 
-            // normalize display fields
-            if (manifest != null)
-            {
-                manifest.Name = this.StripNewlines(manifest.Name);
-                manifest.Description = this.StripNewlines(manifest.Description);
-                manifest.Author = this.StripNewlines(manifest.Author);
-            }
-
             // get mod type
             ModType type;
             {
@@ -365,12 +357,5 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
 
             return hasVortexMarker;
         }
-
-        /// <summary>Strip newlines from a string.</summary>
-        /// <param name="input">The input to strip.</param>
-        private string StripNewlines(string input)
-        {
-            return input?.Replace("\r", "").Replace("\n", "");
-        }
     }
 }
-- 
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/Framework/Constants.cs           |  2 --
 .../Framework/GameScanning/GameScanner.cs          | 32 +++++++++++-----------
 .../Framework/LowLevelEnvironmentUtility.cs        |  8 +++---
 .../Framework/ModScanning/ModFolder.cs             | 14 ++++------
 .../Framework/ModScanning/ModScanner.cs            | 14 ++++------
 .../Framework/SemanticVersionReader.cs             |  6 ++--
 .../Framework/UpdateData/UpdateKey.cs              | 32 +++++++++++-----------
 7 files changed, 51 insertions(+), 57 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/Constants.cs b/src/SMAPI.Toolkit/Framework/Constants.cs
index c3a787c7..55f26582 100644
--- a/src/SMAPI.Toolkit/Framework/Constants.cs
+++ b/src/SMAPI.Toolkit/Framework/Constants.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Toolkit.Framework
 {
     /// <summary>Contains the SMAPI installer's constants and assumptions.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index ac6fe411..4f872f1c 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -41,7 +39,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
             IEnumerable<string> paths = this
                 .GetCustomInstallPaths()
                 .Concat(this.GetDefaultInstallPaths())
-                .Select(PathUtilities.NormalizePath)
+                .Select(path => PathUtilities.NormalizePath(path))
                 .Distinct(StringComparer.OrdinalIgnoreCase);
 
             // yield valid folders
@@ -80,10 +78,12 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                 return GameFolderType.NoGameFound;
 
             // get assembly version
-            Version version;
+            Version? version;
             try
             {
                 version = AssemblyName.GetAssemblyName(executable.FullName).Version;
+                if (version == null)
+                    return GameFolderType.InvalidUnknown;
             }
             catch
             {
@@ -123,7 +123,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                 case Platform.Linux:
                 case Platform.Mac:
                     {
-                        string home = Environment.GetEnvironmentVariable("HOME");
+                        string home = Environment.GetEnvironmentVariable("HOME")!;
 
                         // Linux
                         yield return $"{home}/GOG Games/Stardew Valley/game";
@@ -148,13 +148,13 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                         };
                         foreach (var pair in registryKeys)
                         {
-                            string path = this.GetLocalMachineRegistryValue(pair.Key, pair.Value);
+                            string? path = this.GetLocalMachineRegistryValue(pair.Key, pair.Value);
                             if (!string.IsNullOrWhiteSpace(path))
                                 yield return path;
                         }
 
                         // via Steam library path
-                        string steamPath = this.GetCurrentUserRegistryValue(@"Software\Valve\Steam", "SteamPath");
+                        string? steamPath = this.GetCurrentUserRegistryValue(@"Software\Valve\Steam", "SteamPath");
                         if (steamPath != null)
                             yield return Path.Combine(steamPath.Replace('/', '\\'), @"steamapps\common\Stardew Valley");
 #endif
@@ -188,7 +188,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
         private IEnumerable<string> GetCustomInstallPaths()
         {
             // get home path
-            string homePath = Environment.GetEnvironmentVariable(this.Platform == Platform.Windows ? "USERPROFILE" : "HOME");
+            string homePath = Environment.GetEnvironmentVariable(this.Platform == Platform.Windows ? "USERPROFILE" : "HOME")!;
             if (string.IsNullOrWhiteSpace(homePath))
                 yield break;
 
@@ -210,7 +210,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
             }
 
             // get install path
-            XElement element = root.XPathSelectElement("//*[local-name() = 'GamePath']"); // can't use '//GamePath' due to the default namespace
+            XElement? element = root.XPathSelectElement("//*[local-name() = 'GamePath']"); // can't use '//GamePath' due to the default namespace
             if (!string.IsNullOrWhiteSpace(element?.Value))
                 yield return element.Value.Trim();
         }
@@ -219,27 +219,27 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
         /// <summary>Get the value of a key in the Windows HKLM registry.</summary>
         /// <param name="key">The full path of the registry key relative to HKLM.</param>
         /// <param name="name">The name of the value.</param>
-        private string GetLocalMachineRegistryValue(string key, string name)
+        private string? GetLocalMachineRegistryValue(string key, string name)
         {
             RegistryKey localMachine = Environment.Is64BitOperatingSystem ? RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64) : Registry.LocalMachine;
-            RegistryKey openKey = localMachine.OpenSubKey(key);
+            RegistryKey? openKey = localMachine.OpenSubKey(key);
             if (openKey == null)
                 return null;
             using (openKey)
-                return (string)openKey.GetValue(name);
+                return (string?)openKey.GetValue(name);
         }
 
         /// <summary>Get the value of a key in the Windows HKCU registry.</summary>
         /// <param name="key">The full path of the registry key relative to HKCU.</param>
         /// <param name="name">The name of the value.</param>
-        private string GetCurrentUserRegistryValue(string key, string name)
+        private string? GetCurrentUserRegistryValue(string key, string name)
         {
-            RegistryKey currentuser = Environment.Is64BitOperatingSystem ? RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64) : Registry.CurrentUser;
-            RegistryKey openKey = currentuser.OpenSubKey(key);
+            RegistryKey currentUser = Environment.Is64BitOperatingSystem ? RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64) : Registry.CurrentUser;
+            RegistryKey? openKey = currentUser.OpenSubKey(key);
             if (openKey == null)
                 return null;
             using (openKey)
-                return (string)openKey.GetValue(name);
+                return (string?)openKey.GetValue(name);
         }
 #endif
     }
diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
index 9998edec..6978567e 100644
--- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -59,11 +57,13 @@ namespace StardewModdingAPI.Toolkit.Framework
 #if SMAPI_FOR_WINDOWS
             try
             {
-                return new ManagementObjectSearcher("SELECT Caption FROM Win32_OperatingSystem")
+                string? result = new ManagementObjectSearcher("SELECT Caption FROM Win32_OperatingSystem")
                     .Get()
                     .Cast<ManagementObject>()
                     .Select(entry => entry.GetPropertyValue("Caption").ToString())
                     .FirstOrDefault();
+
+                return result ?? "Windows";
             }
             catch { }
 #endif
@@ -137,7 +137,7 @@ namespace StardewModdingAPI.Toolkit.Framework
                 buffer = Marshal.AllocHGlobal(8192);
                 if (LowLevelEnvironmentUtility.uname(buffer) == 0)
                 {
-                    string os = Marshal.PtrToStringAnsi(buffer);
+                    string? os = Marshal.PtrToStringAnsi(buffer);
                     return os == "Darwin";
                 }
                 return false;
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
index 81d72c0b..da2a3c85 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -24,13 +22,13 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         public ModType Type { get; }
 
         /// <summary>The mod manifest.</summary>
-        public Manifest Manifest { get; }
+        public Manifest? Manifest { get; }
 
         /// <summary>The error which occurred parsing the manifest, if any.</summary>
         public ModParseError ManifestParseError { get; set; }
 
         /// <summary>A human-readable message for the <see cref="ManifestParseError"/>, if any.</summary>
-        public string ManifestParseErrorText { get; set; }
+        public string? ManifestParseErrorText { get; set; }
 
 
         /*********
@@ -51,7 +49,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         /// <param name="manifest">The mod manifest.</param>
         /// <param name="manifestParseError">The error which occurred parsing the manifest, if any.</param>
         /// <param name="manifestParseErrorText">A human-readable message for the <paramref name="manifestParseError"/>, if any.</param>
-        public ModFolder(DirectoryInfo root, DirectoryInfo directory, ModType type, Manifest manifest, ModParseError manifestParseError, string manifestParseErrorText)
+        public ModFolder(DirectoryInfo root, DirectoryInfo directory, ModType type, Manifest? manifest, ModParseError manifestParseError, string? manifestParseErrorText)
         {
             // save info
             this.Directory = directory;
@@ -61,9 +59,9 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             this.ManifestParseErrorText = manifestParseErrorText;
 
             // set display name
-            this.DisplayName = manifest?.Name;
-            if (string.IsNullOrWhiteSpace(this.DisplayName))
-                this.DisplayName = PathUtilities.GetRelativePath(root.FullName, directory.FullName);
+            this.DisplayName = !string.IsNullOrWhiteSpace(manifest?.Name)
+                ? manifest.Name
+                : PathUtilities.GetRelativePath(root.FullName, directory.FullName);
         }
 
         /// <summary>Get the update keys for a mod.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index 621f1e28..2af30092 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -117,7 +115,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         public ModFolder ReadFolder(DirectoryInfo root, DirectoryInfo searchFolder)
         {
             // find manifest.json
-            FileInfo manifestFile = this.FindManifest(searchFolder);
+            FileInfo? manifestFile = this.FindManifest(searchFolder);
 
             // set appropriate invalid-mod error
             if (manifestFile == null)
@@ -147,13 +145,13 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             }
 
             // read mod info
-            Manifest manifest = null;
+            Manifest? manifest = null;
             ModParseError error = ModParseError.None;
-            string errorText = null;
+            string? errorText = null;
             {
                 try
                 {
-                    if (!this.JsonHelper.ReadJsonFileIfExists<Manifest>(manifestFile.FullName, out manifest) || manifest == null)
+                    if (!this.JsonHelper.ReadJsonFileIfExists<Manifest>(manifestFile.FullName, out manifest))
                     {
                         error = ModParseError.ManifestInvalid;
                         errorText = "its manifest is invalid.";
@@ -186,7 +184,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             }
 
             // build result
-            return new ModFolder(root, manifestFile.Directory, type, manifest, error, errorText);
+            return new ModFolder(root, manifestFile.Directory!, type, manifest, error, errorText);
         }
 
 
@@ -249,7 +247,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
 
         /// <summary>Find the manifest for a mod folder.</summary>
         /// <param name="folder">The folder to search.</param>
-        private FileInfo FindManifest(DirectoryInfo folder)
+        private FileInfo? FindManifest(DirectoryInfo folder)
         {
             while (true)
             {
diff --git a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
index 57eea2f7..836b1134 100644
--- a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
+++ b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Toolkit.Framework
 {
@@ -18,7 +18,7 @@ namespace StardewModdingAPI.Toolkit.Framework
         /// <param name="prereleaseTag">An optional prerelease tag.</param>
         /// <param name="buildMetadata">Optional build metadata. This is ignored when determining version precedence.</param>
         /// <returns>Returns whether the version was successfully parsed.</returns>
-        public static bool TryParse(string versionStr, bool allowNonStandard, out int major, out int minor, out int patch, out int platformRelease, out string prereleaseTag, out string buildMetadata)
+        public static bool TryParse(string? versionStr, bool allowNonStandard, out int major, out int minor, out int patch, out int platformRelease, out string? prereleaseTag, out string? buildMetadata)
         {
             // init
             major = 0;
@@ -105,7 +105,7 @@ namespace StardewModdingAPI.Toolkit.Framework
         /// <param name="raw">The raw characters to parse.</param>
         /// <param name="index">The index of the next character to read.</param>
         /// <param name="tag">The parsed tag.</param>
-        private static bool TryParseTag(char[] raw, ref int index, out string tag)
+        private static bool TryParseTag(char[] raw, ref int index, [NotNullWhen(true)] out string? tag)
         {
             // read tag length
             int length = 0;
diff --git a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
index ec94ed51..d40d8f2b 100644
--- a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
+++ b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Toolkit.Framework.UpdateData
 {
@@ -17,10 +16,11 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
         public ModSiteKey Site { get; }
 
         /// <summary>The mod ID within the repository.</summary>
-        public string ID { get; }
+        [MemberNotNullWhen(true, nameof(LooksValid))]
+        public string? ID { get; }
 
         /// <summary>If specified, a substring in download names/descriptions to match.</summary>
-        public string Subkey { get; }
+        public string? Subkey { get; }
 
         /// <summary>Whether the update key seems to be valid.</summary>
         public bool LooksValid { get; }
@@ -34,9 +34,9 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
         /// <param name="site">The mod site containing the mod.</param>
         /// <param name="id">The mod ID within the site.</param>
         /// <param name="subkey">If specified, a substring in download names/descriptions to match.</param>
-        public UpdateKey(string rawText, ModSiteKey site, string id, string subkey)
+        public UpdateKey(string? rawText, ModSiteKey site, string? id, string? subkey)
         {
-            this.RawText = rawText?.Trim();
+            this.RawText = rawText?.Trim() ?? string.Empty;
             this.Site = site;
             this.ID = id?.Trim();
             this.Subkey = subkey?.Trim();
@@ -49,19 +49,19 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
         /// <param name="site">The mod site containing the mod.</param>
         /// <param name="id">The mod ID within the site.</param>
         /// <param name="subkey">If specified, a substring in download names/descriptions to match.</param>
-        public UpdateKey(ModSiteKey site, string id, string subkey)
+        public UpdateKey(ModSiteKey site, string? id, string? subkey)
             : this(UpdateKey.GetString(site, id, subkey), site, id, subkey) { }
 
         /// <summary>Parse a raw update key.</summary>
         /// <param name="raw">The raw update key to parse.</param>
-        public static UpdateKey Parse(string raw)
+        public static UpdateKey Parse(string? raw)
         {
             // extract site + ID
-            string rawSite;
-            string id;
+            string? rawSite;
+            string? id;
             {
-                string[] parts = raw?.Trim().Split(':');
-                if (parts == null || parts.Length != 2)
+                string[]? parts = raw?.Trim().Split(':');
+                if (parts?.Length != 2)
                     return new UpdateKey(raw, ModSiteKey.Unknown, null, null);
 
                 rawSite = parts[0].Trim();
@@ -71,7 +71,7 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
                 id = null;
 
             // extract subkey
-            string subkey = null;
+            string? subkey = null;
             if (id != null)
             {
                 string[] parts = id.Split('@');
@@ -111,7 +111,7 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
 
         /// <summary>Indicates whether the current object is equal to another object of the same type.</summary>
         /// <param name="other">An object to compare with this object.</param>
-        public bool Equals(UpdateKey other)
+        public bool Equals(UpdateKey? other)
         {
             if (!this.LooksValid)
             {
@@ -129,7 +129,7 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
 
         /// <summary>Determines whether the specified object is equal to the current object.</summary>
         /// <param name="obj">The object to compare with the current object.</param>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return obj is UpdateKey other && this.Equals(other);
         }
@@ -145,7 +145,7 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
         /// <param name="site">The mod site containing the mod.</param>
         /// <param name="id">The mod ID within the repository.</param>
         /// <param name="subkey">If specified, a substring in download names/descriptions to match.</param>
-        public static string GetString(ModSiteKey site, string id, string subkey = null)
+        public static string GetString(ModSiteKey site, string? id, string? subkey = null)
         {
             return $"{site}:{id}{subkey}".Trim();
         }
-- 
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/Framework/SemanticVersionReader.cs | 7 ++++++-
 src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs  | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
index 836b1134..939be771 100644
--- a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
+++ b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
@@ -105,7 +105,12 @@ namespace StardewModdingAPI.Toolkit.Framework
         /// <param name="raw">The raw characters to parse.</param>
         /// <param name="index">The index of the next character to read.</param>
         /// <param name="tag">The parsed tag.</param>
-        private static bool TryParseTag(char[] raw, ref int index, [NotNullWhen(true)] out string? tag)
+        private static bool TryParseTag(char[] raw, ref int index,
+#if NET5_0_OR_GREATER
+            [NotNullWhen(true)]
+#endif
+            out string? tag
+        )
         {
             // read tag length
             int length = 0;
diff --git a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
index d40d8f2b..4c9ca2ff 100644
--- a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
+++ b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
@@ -16,7 +16,9 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
         public ModSiteKey Site { get; }
 
         /// <summary>The mod ID within the repository.</summary>
+#if NET5_0_OR_GREATER
         [MemberNotNullWhen(true, nameof(LooksValid))]
+#endif
         public string? ID { get; }
 
         /// <summary>If specified, a substring in download names/descriptions to match.</summary>
-- 
cgit 


From 376dadd3412752cf406958ca889e326bfdd53087 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 9 Apr 2022 16:58:52 -0400
Subject: fix misplaced attribute (#837)

---
 src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
index 4c9ca2ff..960caf96 100644
--- a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
+++ b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
@@ -16,15 +16,15 @@ namespace StardewModdingAPI.Toolkit.Framework.UpdateData
         public ModSiteKey Site { get; }
 
         /// <summary>The mod ID within the repository.</summary>
-#if NET5_0_OR_GREATER
-        [MemberNotNullWhen(true, nameof(LooksValid))]
-#endif
         public string? ID { get; }
 
         /// <summary>If specified, a substring in download names/descriptions to match.</summary>
         public string? Subkey { get; }
 
         /// <summary>Whether the update key seems to be valid.</summary>
+#if NET5_0_OR_GREATER
+        [MemberNotNullWhen(true, nameof(UpdateKey.ID))]
+#endif
         public bool LooksValid { get; }
 
 
-- 
cgit 


From c92efc65ce7cbfbca3e92e027141e6b8d90073c8 Mon Sep 17 00:00:00 2001
From: Nuz / Lovegood <nuztalgia@gmail.com>
Date: Sun, 10 Apr 2022 18:20:11 -0700
Subject: Make ModScanner ignore .gitignore files.

This is helpful for cases like this: https://cdn.discordapp.com/attachments/156109690059751424/962879339739885578/unknown.png
---
 src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index 2af30092..59652832 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -56,7 +56,10 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
 
             // Windows shortcut files
             ".url",
-            ".lnk"
+            ".lnk",
+
+            // gitignore files
+            ".gitignore"
         };
 
         /// <summary>The extensions for packed content files.</summary>
-- 
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)

---
 .../Framework/ModData/MetadataModel.cs             |  4 +--
 .../Framework/ModData/ModDataField.cs              | 10 +++----
 .../Framework/ModData/ModDataModel.cs              | 32 +++++++++++++---------
 .../Framework/ModData/ModDataRecord.cs             | 10 +++----
 .../ModData/ModDataRecordVersionedFields.cs        | 28 +++++++++++--------
 src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs | 14 ++++------
 6 files changed, 51 insertions(+), 47 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework')

diff --git a/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
index 3fa70615..da678ac9 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Toolkit.Framework.ModData
@@ -11,6 +9,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         ** Accessors
         ********/
         /// <summary>Extra metadata about mods.</summary>
-        public IDictionary<string, ModDataModel> ModData { get; set; }
+        public IDictionary<string, ModDataModel> ModData { get; } = new Dictionary<string, ModDataModel>();
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
index 46cb81e1..9674d283 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Linq;
 
 namespace StardewModdingAPI.Toolkit.Framework.ModData
@@ -20,10 +18,10 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         public bool IsDefault { get; }
 
         /// <summary>The lowest version in the range, or <c>null</c> for all past versions.</summary>
-        public ISemanticVersion LowerVersion { get; }
+        public ISemanticVersion? LowerVersion { get; }
 
         /// <summary>The highest version in the range, or <c>null</c> for all future versions.</summary>
-        public ISemanticVersion UpperVersion { get; }
+        public ISemanticVersion? UpperVersion { get; }
 
 
         /*********
@@ -35,7 +33,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <param name="isDefault">Whether this field should only be applied if it's not already set.</param>
         /// <param name="lowerVersion">The lowest version in the range, or <c>null</c> for all past versions.</param>
         /// <param name="upperVersion">The highest version in the range, or <c>null</c> for all future versions.</param>
-        public ModDataField(ModDataFieldKey key, string value, bool isDefault, ISemanticVersion lowerVersion, ISemanticVersion upperVersion)
+        public ModDataField(ModDataFieldKey key, string value, bool isDefault, ISemanticVersion? lowerVersion, ISemanticVersion? upperVersion)
         {
             this.Key = key;
             this.Value = value;
@@ -46,7 +44,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
 
         /// <summary>Get whether this data field applies for the given manifest.</summary>
         /// <param name="manifest">The mod manifest.</param>
-        public bool IsMatch(IManifest manifest)
+        public bool IsMatch(IManifest? manifest)
         {
             return
                 manifest?.Version != null // ignore invalid manifest
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
index 4d96a555..5912fb87 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +14,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         ** Accessors
         *********/
         /// <summary>The mod's current unique ID.</summary>
-        public string ID { get; set; }
+        public string ID { get; }
 
         /// <summary>The former mod IDs (if any).</summary>
         /// <remarks>
@@ -25,14 +23,14 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// ID, if any. If the mod's ID changed over time, multiple variants can be separated by the
         /// <c>|</c> character.
         /// </remarks>
-        public string FormerIDs { get; set; }
+        public string? FormerIDs { get; }
 
         /// <summary>The mod warnings to suppress, even if they'd normally be shown.</summary>
-        public ModWarning SuppressWarnings { get; set; }
+        public ModWarning SuppressWarnings { get; }
 
         /// <summary>This field stores properties that aren't mapped to another field before they're parsed into <see cref="Fields"/>.</summary>
         [JsonExtensionData]
-        public IDictionary<string, JToken> ExtensionData { get; set; }
+        public IDictionary<string, JToken> ExtensionData { get; } = new Dictionary<string, JToken>();
 
         /// <summary>The versioned field data.</summary>
         /// <remarks>
@@ -52,6 +50,17 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /*********
         ** Public methods
         *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="id">The mod's current unique ID.</param>
+        /// <param name="formerIds">The former mod IDs (if any).</param>
+        /// <param name="suppressWarnings">The mod warnings to suppress, even if they'd normally be shown.</param>
+        public ModDataModel(string id, string? formerIds, ModWarning suppressWarnings)
+        {
+            this.ID = id;
+            this.FormerIDs = formerIds;
+            this.SuppressWarnings = suppressWarnings;
+        }
+
         /// <summary>Get a parsed representation of the <see cref="Fields"/>.</summary>
         public IEnumerable<ModDataField> GetFields()
         {
@@ -61,8 +70,8 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
                 string packedKey = pair.Key;
                 string value = pair.Value;
                 bool isDefault = false;
-                ISemanticVersion lowerVersion = null;
-                ISemanticVersion upperVersion = null;
+                ISemanticVersion? lowerVersion = null;
+                ISemanticVersion? upperVersion = null;
 
                 // parse
                 string[] parts = packedKey.Split('|').Select(p => p.Trim()).ToArray();
@@ -113,11 +122,8 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         [OnDeserialized]
         private void OnDeserialized(StreamingContext context)
         {
-            if (this.ExtensionData != null)
-            {
-                this.Fields = this.ExtensionData.ToDictionary(p => p.Key, p => p.Value.ToString());
-                this.ExtensionData = null;
-            }
+            this.Fields = this.ExtensionData.ToDictionary(p => p.Key, p => p.Value.ToString());
+            this.