diff options
| -rw-r--r-- | src/SMAPI.Common/Models/ModInfoModel.cs | 11 | ||||
| -rw-r--r-- | src/SMAPI.Common/SemanticVersionImpl.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj | 3 | ||||
| -rw-r--r-- | src/SMAPI.ModBuildConfig/Tasks/CreateModReleaseZip.cs | 4 | ||||
| -rw-r--r-- | src/SMAPI.sln | 1 |
5 files changed, 10 insertions, 11 deletions
diff --git a/src/SMAPI.Common/Models/ModInfoModel.cs b/src/SMAPI.Common/Models/ModInfoModel.cs index e071c0bb..4daa7064 100644 --- a/src/SMAPI.Common/Models/ModInfoModel.cs +++ b/src/SMAPI.Common/Models/ModInfoModel.cs @@ -1,5 +1,3 @@ -using Newtonsoft.Json; - namespace StardewModdingAPI.Common.Models { /// <summary>Generic metadata about a mod.</summary> @@ -9,16 +7,16 @@ namespace StardewModdingAPI.Common.Models ** Accessors *********/ /// <summary>The mod name.</summary> - public string Name { get; } + public string Name { get; set; } /// <summary>The mod's semantic version number.</summary> - public string Version { get; } + public string Version { get; set; } /// <summary>The mod's web URL.</summary> - public string Url { get; } + public string Url { get; set; } /// <summary>The error message indicating why the mod is invalid (if applicable).</summary> - public string Error { get; } + public string Error { get; set; } /********* @@ -29,7 +27,6 @@ namespace StardewModdingAPI.Common.Models /// <param name="version">The mod's semantic version number.</param> /// <param name="url">The mod's web URL.</param> /// <param name="error">The error message indicating why the mod is invalid (if applicable).</param> - [JsonConstructor] public ModInfoModel(string name, string version, string url, string error = null) { this.Name = name; diff --git a/src/SMAPI.Common/SemanticVersionImpl.cs b/src/SMAPI.Common/SemanticVersionImpl.cs index e0f68a7e..193d23f9 100644 --- a/src/SMAPI.Common/SemanticVersionImpl.cs +++ b/src/SMAPI.Common/SemanticVersionImpl.cs @@ -1,6 +1,5 @@ using System; using System.Text.RegularExpressions; -using Newtonsoft.Json; namespace StardewModdingAPI.Common { @@ -41,7 +40,6 @@ namespace StardewModdingAPI.Common /// <param name="minor">The minor version incremented for backwards-compatible changes.</param> /// <param name="patch">The patch version for backwards-compatible bug fixes.</param> /// <param name="tag">An optional prerelease tag.</param> - [JsonConstructor] public SemanticVersionImpl(int major, int minor, int patch, string tag = null) { this.Major = major; diff --git a/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj index 9b68fe57..d32ccd9f 100644 --- a/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj +++ b/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> @@ -55,5 +55,6 @@ <ItemGroup> <Content Include="assets\nuget-icon.png" /> </ItemGroup> + <Import Project="..\SMAPI.Common\StardewModdingAPI.Common.projitems" Label="Shared" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project>
\ No newline at end of file diff --git a/src/SMAPI.ModBuildConfig/Tasks/CreateModReleaseZip.cs b/src/SMAPI.ModBuildConfig/Tasks/CreateModReleaseZip.cs index c8582488..26f2ed44 100644 --- a/src/SMAPI.ModBuildConfig/Tasks/CreateModReleaseZip.cs +++ b/src/SMAPI.ModBuildConfig/Tasks/CreateModReleaseZip.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Web.Script.Serialization; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using StardewModdingAPI.Common; namespace StardewModdingAPI.ModBuildConfig.Tasks { @@ -115,8 +116,9 @@ namespace StardewModdingAPI.ModBuildConfig.Tasks int major = versionFields.ContainsKey("MajorVersion") ? (int)versionFields["MajorVersion"] : 0; int minor = versionFields.ContainsKey("MinorVersion") ? (int)versionFields["MinorVersion"] : 0; int patch = versionFields.ContainsKey("PatchVersion") ? (int)versionFields["PatchVersion"] : 0; + string tag = versionFields.ContainsKey("Build") ? (string)versionFields["Build"] : null; - return $"{major}.{minor}.{patch}"; + return new SemanticVersionImpl(major, minor, patch, tag).ToString(); } /// <summary>Get a case-insensitive dictionary matching the given JSON.</summary> diff --git a/src/SMAPI.sln b/src/SMAPI.sln index d43ba1c2..5590d497 100644 --- a/src/SMAPI.sln +++ b/src/SMAPI.sln @@ -50,6 +50,7 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution SMAPI.Common\StardewModdingAPI.Common.projitems*{2aa02fb6-ff03-41cf-a215-2ee60ab4f5dc}*SharedItemsImports = 13 + SMAPI.Common\StardewModdingAPI.Common.projitems*{ea4f1e80-743f-4a1d-9757-ae66904a196a}*SharedItemsImports = 4 SMAPI.Common\StardewModdingAPI.Common.projitems*{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution |