Merge branch 'develop' into stable

4 files changed, 23 insertions, 16 deletions

diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
index f0a7c82a..2fb6ed20 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
@@ -62,16 +62,15 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         private TResult Post<TBody, TResult>(string url, TBody content)
         {
             // note: avoid HttpClient for Mac compatibility
-            using (WebClient client = new WebClient())
-            {
-                Uri fullUrl = new Uri(this.BaseUrl, url);
-                string data = JsonConvert.SerializeObject(content);
+            using WebClient client = new WebClient();
 
-                client.Headers["Content-Type"] = "application/json";
-                client.Headers["User-Agent"] = $"SMAPI/{this.Version}";
-                string response = client.UploadString(fullUrl, data);
-                return JsonConvert.DeserializeObject<TResult>(response, this.JsonSettings);
-            }
+            Uri fullUrl = new Uri(this.BaseUrl, url);
+            string data = JsonConvert.SerializeObject(content);
+
+            client.Headers["Content-Type"] = "application/json";
+            client.Headers["User-Agent"] = $"SMAPI/{this.Version}";
+            string response = client.UploadString(fullUrl, data);
+            return JsonConvert.DeserializeObject<TResult>(response, this.JsonSettings);
         }
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index c829c0f4..34e2e1b8 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -105,6 +105,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
                 string pullRequestUrl = this.GetAttribute(node, "data-pr");
                 IDictionary<string, string> mapLocalVersions = this.GetAttributeAsVersionMapping(node, "data-map-local-versions");
                 IDictionary<string, string> mapRemoteVersions = this.GetAttributeAsVersionMapping(node, "data-map-remote-versions");
+                string[] changeUpdateKeys = this.GetAttributeAsCsv(node, "data-change-update-keys");
 
                 // parse stable compatibility
                 WikiCompatibilityInfo compatibility = new WikiCompatibilityInfo
@@ -153,6 +154,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
                     Warnings = warnings,
                     PullRequestUrl = pullRequestUrl,
                     DevNote = devNote,
+                    ChangeUpdateKeys = changeUpdateKeys,
                     MapLocalVersions = mapLocalVersions,
                     MapRemoteVersions = mapRemoteVersions,
                     Anchor = anchor
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
index a1d2dfae..5cdf489f 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
@@ -3,25 +3,28 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
     /// <summary>The compatibility status for a mod.</summary>
     public enum WikiCompatibilityStatus
     {
+        /// <summary>The status is unknown.</summary>
+        Unknown,
+
         /// <summary>The mod is compatible.</summary>
-        Ok = 0,
+        Ok,
 
         /// <summary>The mod is compatible if you use an optional official download.</summary>
-        Optional = 1,
+        Optional,
 
         /// <summary>The mod is compatible if you use an unofficial update.</summary>
-        Unofficial = 2,
+        Unofficial,
 
         /// <summary>The mod isn't compatible, but the player can fix it or there's a good alternative.</summary>
-        Workaround = 3,
+        Workaround,
 
         /// <summary>The mod isn't compatible.</summary>
-        Broken = 4,
+        Broken,
 
         /// <summary>The mod is no longer maintained by the author, and an unofficial update or continuation is unlikely.</summary>
-        Abandoned = 5,
+        Abandoned,
 
         /// <summary>The mod is no longer needed and should be removed.</summary>
-        Obsolete = 6
+        Obsolete
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
index 474dce3d..21466c6a 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
@@ -63,6 +63,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
         /// <summary>Special notes intended for developers who maintain unofficial updates or submit pull requests. </summary>
         public string DevNote { get; set; }
 
+        /// <summary>Update keys to add (optionally prefixed by '+') or remove (prefixed by '-').</summary>
+        public string[] ChangeUpdateKeys { get; set; }
+
         /// <summary>Maps local versions to a semantic version for update checks.</summary>
         public IDictionary<string, string> MapLocalVersions { get; set; }