From 6ddcef61e94a81711ad25a378f0fa03d7799f2dc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 20 Jul 2017 00:05:39 -0400
Subject: simplify mod compatibility model parsing

---
 .../Framework/Models/ModCompatibility.cs           | 35 ++++------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

(limited to 'src/StardewModdingAPI/Framework/Models/ModCompatibility.cs')

diff --git a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
index 90cbd237..eb312eff 100644
--- a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
+++ b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
@@ -1,5 +1,5 @@
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using StardewModdingAPI.Framework.Serialisation;
 
 namespace StardewModdingAPI.Framework.Models
 {
@@ -19,10 +19,12 @@ namespace StardewModdingAPI.Framework.Models
         public string Name { get; set; }
 
         /// <summary>The oldest incompatible mod version, or <c>null</c> for all past versions.</summary>
-        public string LowerVersion { get; set; }
+        [JsonConverter(typeof(SFieldConverter))]
+        public ISemanticVersion LowerVersion { get; set; }
 
         /// <summary>The most recent incompatible mod version.</summary>
-        public string UpperVersion { get; set; }
+        [JsonConverter(typeof(SFieldConverter))]
+        public ISemanticVersion UpperVersion { get; set; }
 
         /// <summary>A label to show to the user instead of <see cref="UpperVersion"/>, when the manifest version differs from the user-facing version.</summary>
         public string UpperVersionLabel { get; set; }
@@ -39,30 +41,5 @@ namespace StardewModdingAPI.Framework.Models
 
         /// <summary>Indicates how SMAPI should consider the mod.</summary>
         public ModCompatibilityType Compatibility { get; set; }
-
-
-        /****
-        ** Injected
-        ****/
-        /// <summary>The semantic version corresponding to <see cref="LowerVersion"/>.</summary>
-        [JsonIgnore]
-        public ISemanticVersion LowerSemanticVersion { get; set; }
-
-        /// <summary>The semantic version corresponding to <see cref="UpperVersion"/>.</summary>
-        [JsonIgnore]
-        public ISemanticVersion UpperSemanticVersion { get; set; }
-
-
-        /*********
-        ** Private methods
-        *********/
-        /// <summary>The method called when the model finishes deserialising.</summary>
-        /// <param name="context">The deserialisation context.</param>
-        [OnDeserialized]
-        private void OnDeserialized(StreamingContext context)
-        {
-            this.LowerSemanticVersion = this.LowerVersion != null ? new SemanticVersion(this.LowerVersion) : null;
-            this.UpperSemanticVersion = this.UpperVersion != null ? new SemanticVersion(this.UpperVersion) : null;
-        }
     }
 }
-- 
cgit 


From 7d73b0bf0c545b281d9d84bc73ad40932764b483 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 20 Jul 2017 00:37:58 -0400
Subject: simplify compatibility skip message in 2.0 & combine update URL
 fields

---
 src/StardewModdingAPI/Framework/Models/ModCompatibility.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/StardewModdingAPI/Framework/Models/ModCompatibility.cs')

diff --git a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
index eb312eff..72b6f2af 100644
--- a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
+++ b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
@@ -29,11 +29,8 @@ namespace StardewModdingAPI.Framework.Models
         /// <summary>A label to show to the user instead of <see cref="UpperVersion"/>, when the manifest version differs from the user-facing version.</summary>
         public string UpperVersionLabel { get; set; }
 
-        /// <summary>The URL the user can check for an official updated version.</summary>
-        public string UpdateUrl { get; set; }
-
-        /// <summary>The URL the user can check for an unofficial updated version.</summary>
-        public string UnofficialUpdateUrl { get; set; }
+        /// <summary>The URLs the user can check for a newer version.</summary>
+        public string[] UpdateUrls { get; set; }
 
         /// <summary>The reason phrase to show in the warning, or <c>null</c> to use the default value.</summary>
         /// <example>"this version is incompatible with the latest version of the game"</example>
-- 
cgit 


From 7c1ac555a401819bf01ebe0e515b02416bc49b15 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 20 Jul 2017 00:47:28 -0400
Subject: simplify compatibility list by defaulting compatibility type, update
 readme

---
 src/StardewModdingAPI/Framework/Models/ModCompatibility.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/StardewModdingAPI/Framework/Models/ModCompatibility.cs')

diff --git a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
index 72b6f2af..91be1d38 100644
--- a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
+++ b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
@@ -37,6 +37,6 @@ namespace StardewModdingAPI.Framework.Models
         public string ReasonPhrase { get; set; }
 
         /// <summary>Indicates how SMAPI should consider the mod.</summary>
-        public ModCompatibilityType Compatibility { get; set; }
+        public ModCompatibilityType Compatibility { get; set; } = ModCompatibilityType.AssumeBroken;
     }
 }
-- 
cgit 


From c20b21bcaa799a9961799316b7f4b7d8f929ca3f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 21 Jul 2017 01:51:05 -0400
Subject: add support for disambiguating IDs in mod compatibility list

---
 src/StardewModdingAPI/Framework/Models/ModCompatibility.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/StardewModdingAPI/Framework/Models/ModCompatibility.cs')

diff --git a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
index 91be1d38..d3a9c533 100644
--- a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
+++ b/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs
@@ -9,11 +9,9 @@ namespace StardewModdingAPI.Framework.Models
         /*********
         ** Accessors
         *********/
-        /****
-        ** From config
-        ****/
         /// <summary>The unique mod IDs.</summary>
-        public string[] ID { get; set; }
+        [JsonConverter(typeof(SFieldConverter))]
+        public ModCompatibilityID[] ID { get; set; }
 
         /// <summary>The mod name.</summary>
         public string Name { get; set; }
-- 
cgit