From 6d11c41facb2e1397a25110517cc281f87be2caf Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 28 Jun 2022 18:17:27 -0400
Subject: migrate update checks to FluentHttpClient

WebClient isn't needed for compatibility with macOS after the .NET 5 update in Stardew Valley 1.5.5, and causes noticeable lag for some players even when running on a background thread.
---
 src/SMAPI.Toolkit/Serialization/JsonHelper.cs | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

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

diff --git a/src/SMAPI.Toolkit/Serialization/JsonHelper.cs b/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
index 1a003c51..a5d7e2e8 100644
--- a/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
+++ b/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
@@ -15,21 +15,27 @@ namespace StardewModdingAPI.Toolkit.Serialization
         ** Accessors
         *********/
         /// <summary>The JSON settings to use when serializing and deserializing files.</summary>
-        public JsonSerializerSettings JsonSettings { get; } = new()
-        {
-            Formatting = Formatting.Indented,
-            ObjectCreationHandling = ObjectCreationHandling.Replace, // avoid issue where default ICollection<T> values are duplicated each time the config is loaded
-            Converters = new List<JsonConverter>
-            {
-                new SemanticVersionConverter(),
-                new StringEnumConverter()
-            }
-        };
+        public JsonSerializerSettings JsonSettings { get; } = JsonHelper.CreateDefaultSettings();
 
 
         /*********
         ** Public methods
         *********/
+        /// <summary>Create an instance of the default JSON serializer settings.</summary>
+        public static JsonSerializerSettings CreateDefaultSettings()
+        {
+            return new()
+            {
+                Formatting = Formatting.Indented,
+                ObjectCreationHandling = ObjectCreationHandling.Replace, // avoid issue where default ICollection<T> values are duplicated each time the config is loaded
+                Converters = new List<JsonConverter>
+                {
+                    new SemanticVersionConverter(),
+                    new StringEnumConverter()
+                }
+            };
+        }
+
         /// <summary>Read a JSON file.</summary>
         /// <typeparam name="TModel">The model type.</typeparam>
         /// <param name="fullPath">The absolute file path.</param>
-- 
cgit 


From 9c9552531f8f085cded6ed5158503e75b00be1ff Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Jul 2022 19:25:15 -0400
Subject: fix build warnings

---
 .../Serialization/Converters/SemanticVersionConverter.cs           | 7 ++++++-
 .../Serialization/Converters/SimpleReadOnlyConverter.cs            | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

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

diff --git a/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs
index c32c3185..913d54e0 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs
@@ -48,7 +48,12 @@ namespace StardewModdingAPI.Toolkit.Serialization.Converters
                     return this.ReadObject(JObject.Load(reader));
 
                 case JsonToken.String:
-                    return this.ReadString(JToken.Load(reader).Value<string>(), path);
+                    {
+                        string? value = JToken.Load(reader).Value<string>();
+                        return value is not null
+                            ? this.ReadString(value, path)
+                            : null;
+                    }
 
                 default:
                     throw new SParseException($"Can't parse {nameof(ISemanticVersion)} from {reader.TokenType} node (path: {reader.Path}).");
diff --git a/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
index 1c59f5e7..cdf2ed77 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
@@ -42,7 +42,12 @@ namespace StardewModdingAPI.Toolkit.Serialization.Converters
                     return this.ReadObject(JObject.Load(reader), path);
 
                 case JsonToken.String:
-                    return this.ReadString(JToken.Load(reader).Value<string>(), path);
+                    {
+                        string? value = JToken.Load(reader).Value<string>();
+                        return value is not null
+                            ? this.ReadString(value, path)
+                            : null;
+                    }
 
                 default:
                     throw new SParseException($"Can't parse {typeof(T).Name} from {reader.TokenType} node (path: {reader.Path}).");
-- 
cgit