StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ISemanticVersion deserialisation errors (#532)

This commit is contained in:
Jesse Plamondon-Willard 2018-06-24 23:01:39 -04:00
parent b08e27d13a
commit 85efb31129
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs
View File

@ -2,8 +2,8 @@ using Newtonsoft.Json.Linq;
namespace StardewModdingAPI.Toolkit.Serialisation.Converters namespace StardewModdingAPI.Toolkit.Serialisation.Converters
{ {
/// <summary>Handles deserialisation of <see cref="SemanticVersion"/>.</summary> /// <summary>Handles deserialisation of <see cref="ISemanticVersion"/>.</summary>
internal class SemanticVersionConverter : SimpleReadOnlyConverter<SemanticVersion> internal class SemanticVersionConverter : SimpleReadOnlyConverter<ISemanticVersion>
{ {
/********* /*********
** Protected methods ** Protected methods
@ -11,7 +11,7 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Converters
/// <summary>Read a JSON object.</summary> /// <summary>Read a JSON object.</summary>
/// <param name="obj">The JSON object to read.</param> /// <param name="obj">The JSON object to read.</param>
/// <param name="path">The path to the current JSON node.</param> /// <param name="path">The path to the current JSON node.</param>
protected override SemanticVersion ReadObject(JObject obj, string path) protected override ISemanticVersion ReadObject(JObject obj, string path)
{ {
int major = obj.ValueIgnoreCase<int>("MajorVersion"); int major = obj.ValueIgnoreCase<int>("MajorVersion");
int minor = obj.ValueIgnoreCase<int>("MinorVersion"); int minor = obj.ValueIgnoreCase<int>("MinorVersion");
@ -26,7 +26,7 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Converters
/// <summary>Read a JSON string.</summary> /// <summary>Read a JSON string.</summary>
/// <param name="str">The JSON string value.</param> /// <param name="str">The JSON string value.</param>
/// <param name="path">The path to the current JSON node.</param> /// <param name="path">The path to the current JSON node.</param>
protected override SemanticVersion ReadString(string str, string path) protected override ISemanticVersion ReadString(string str, string path)
{ {
if (string.IsNullOrWhiteSpace(str)) if (string.IsNullOrWhiteSpace(str))
return null; return null;

2
src/StardewModdingAPI.Toolkit/Serialisation/Models/Manifest.cs
View File

@ -20,11 +20,9 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Models
public string Author { get; set; } public string Author { get; set; }
/// <summary>The mod version.</summary> /// <summary>The mod version.</summary>
[JsonConverter(typeof(SemanticVersionConverter))]
public ISemanticVersion Version { get; set; } public ISemanticVersion Version { get; set; }
/// <summary>The minimum SMAPI version required by this mod, if any.</summary> /// <summary>The minimum SMAPI version required by this mod, if any.</summary>
[JsonConverter(typeof(SemanticVersionConverter))]
public ISemanticVersion MinimumApiVersion { get; set; } public ISemanticVersion MinimumApiVersion { get; set; }
/// <summary>The name of the DLL in the directory that has the <c>Entry</c> method. Mutually exclusive with <see cref="ContentPackFor"/>.</summary> /// <summary>The name of the DLL in the directory that has the <c>Entry</c> method. Mutually exclusive with <see cref="ContentPackFor"/>.</summary>

4
src/StardewModdingAPI.Toolkit/Serialisation/Models/ManifestContentPackFor.cs
View File

@ -1,6 +1,3 @@
using Newtonsoft.Json;
using StardewModdingAPI.Toolkit.Serialisation.Converters;
namespace StardewModdingAPI.Toolkit.Serialisation.Models namespace StardewModdingAPI.Toolkit.Serialisation.Models
{ {
/// <summary>Indicates which mod can read the content pack represented by the containing manifest.</summary> /// <summary>Indicates which mod can read the content pack represented by the containing manifest.</summary>
@ -13,7 +10,6 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Models
public string UniqueID { get; set; } public string UniqueID { get; set; }
/// <summary>The minimum required version (if any).</summary> /// <summary>The minimum required version (if any).</summary>
[JsonConverter(typeof(SemanticVersionConverter))]
public ISemanticVersion MinimumVersion { get; set; } public ISemanticVersion MinimumVersion { get; set; }
} }
} }

4
src/StardewModdingAPI.Toolkit/Serialisation/Models/ManifestDependency.cs
View File

@ -1,6 +1,3 @@
using Newtonsoft.Json;
using StardewModdingAPI.Toolkit.Serialisation.Converters;
namespace StardewModdingAPI.Toolkit.Serialisation.Models namespace StardewModdingAPI.Toolkit.Serialisation.Models
{ {
/// <summary>A mod dependency listed in a mod manifest.</summary> /// <summary>A mod dependency listed in a mod manifest.</summary>
@ -13,7 +10,6 @@ namespace StardewModdingAPI.Toolkit.Serialisation.Models
public string UniqueID { get; set; } public string UniqueID { get; set; }
/// <summary>The minimum required version (if any).</summary> /// <summary>The minimum required version (if any).</summary>
[JsonConverter(typeof(SemanticVersionConverter))]
public ISemanticVersion MinimumVersion { get; set; } public ISemanticVersion MinimumVersion { get; set; }
/// <summary>Whether the dependency must be installed to use the mod.</summary> /// <summary>Whether the dependency must be installed to use the mod.</summary>