From f9eb16489fcf3f4c486df5f96a94edf16cf19a09 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 18 Aug 2018 14:44:18 -0400
Subject: refactor some methods for reuse (#468)

---
 .../Serialisation/JsonHelper.cs                          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/StardewModdingAPI.Toolkit/Serialisation')

diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs b/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs
index cc8eeb73..dcc0dac4 100644
--- a/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs
+++ b/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs
@@ -95,18 +95,14 @@ namespace StardewModdingAPI.Toolkit.Serialisation
                 Directory.CreateDirectory(dir);
 
             // write file
-            string json = JsonConvert.SerializeObject(model, this.JsonSettings);
+            string json = this.Serialise(model);
             File.WriteAllText(fullPath, json);
         }
 
-
-        /*********
-        ** Private methods
-        *********/
         /// <summary>Deserialize JSON text if possible.</summary>
         /// <typeparam name="TModel">The model type.</typeparam>
         /// <param name="json">The raw JSON text.</param>
-        private TModel Deserialise<TModel>(string json)
+        public TModel Deserialise<TModel>(string json)
         {
             try
             {
@@ -127,5 +123,13 @@ namespace StardewModdingAPI.Toolkit.Serialisation
                 throw;
             }
         }
+
+        /// <summary>Serialize a model to JSON text.</summary>
+        /// <typeparam name="TModel">The model type.</typeparam>
+        /// <param name="model">The model to serialise.</param>
+        public string Serialise<TModel>(TModel model)
+        {
+            return JsonConvert.SerializeObject(model, this.JsonSettings);
+        }
     }
 }
-- 
cgit 


From 417c04076634ea87d7b3030a1acf46825da6e3e6 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 19 Aug 2018 01:53:35 -0400
Subject: add data API (#468)

---
 src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/StardewModdingAPI.Toolkit/Serialisation')

diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs b/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs
index dcc0dac4..cf2ce0d1 100644
--- a/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs
+++ b/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs
@@ -127,9 +127,10 @@ namespace StardewModdingAPI.Toolkit.Serialisation
         /// <summary>Serialize a model to JSON text.</summary>
         /// <typeparam name="TModel">The model type.</typeparam>
         /// <param name="model">The model to serialise.</param>
-        public string Serialise<TModel>(TModel model)
+        /// <param name="formatting">The formatting to apply.</param>
+        public string Serialise<TModel>(TModel model, Formatting formatting = Formatting.Indented)
         {
-            return JsonConvert.SerializeObject(model, this.JsonSettings);
+            return JsonConvert.SerializeObject(model, formatting, this.JsonSettings);
         }
     }
 }
-- 
cgit 


From 9c7858a28a8ae7e14a6654c41c2b5981d88b10ff Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 31 Aug 2018 17:44:03 -0400
Subject: tweak semantic version converter to avoid invalid cast errors

---
 .../Serialisation/Converters/SemanticVersionConverter.cs              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/StardewModdingAPI.Toolkit/Serialisation')

diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs b/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
index 9b2f5e7d..39e990d5 100644
--- a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
+++ b/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
@@ -24,7 +24,7 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Converters
         /// <param name="objectType">The object type.</param>
         public override bool CanConvert(Type objectType)
         {
-            return typeof(ISemanticVersion).IsAssignableFrom(objectType);
+            return objectType == typeof(ISemanticVersion);
         }
 
         /// <summary>Reads the JSON representation of the object.</summary>
@@ -82,7 +82,7 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Converters
                 return null;
             if (!SemanticVersion.TryParse(str, out ISemanticVersion version))
                 throw new SParseException($"Can't parse semantic version from invalid value '{str}', should be formatted like 1.2, 1.2.30, or 1.2.30-beta (path: {path}).");
-            return (SemanticVersion)version;
+            return version;
         }
     }
 }
-- 
cgit 


From 47101419f2cf4b3c532fd996840d7301e77e7785 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 6 Sep 2018 20:22:42 -0400
Subject: fix SemanticVersionConverter no longer writing JSON in some cases

---
 .../Serialisation/Converters/SemanticVersionConverter.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/StardewModdingAPI.Toolkit/Serialisation')

diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs b/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
index 39e990d5..070f2c97 100644
--- a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
+++ b/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
@@ -24,7 +24,7 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Converters
         /// <param name="objectType">The object type.</param>
         public override bool CanConvert(Type objectType)
         {
-            return objectType == typeof(ISemanticVersion);
+            return typeof(ISemanticVersion).IsAssignableFrom(objectType);
         }
 
         /// <summary>Reads the JSON representation of the object.</summary>
-- 
cgit 


From 0b03b4f16a446e4b139efd33f6378598ae66efee Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 7 Nov 2018 12:04:20 -0500
Subject: deprecate old manifest version format

---
 .../Serialisation/Converters/SemanticVersionConverter.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/StardewModdingAPI.Toolkit/Serialisation')

diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs b/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
index 070f2c97..e0e185c9 100644
--- a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
+++ b/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
@@ -70,7 +70,7 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Converters
             if (build == "0")
                 build = null; // '0' from incorrect examples in old SMAPI documentation
 
-            return new SemanticVersion(major, minor, patch, build);
+            return new SemanticVersion(major, minor, patch, build, isLegacyFormat: true);
         }
 
         /// <summary>Read a JSON string.</summary>
-- 
cgit