From 6ee0d2f93d5d06556915f41e29621c59d9e9e551 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 10 Nov 2022 23:27:38 -0500 Subject: [PATCH] don't validate manifest if we're not deploying or zipping the mod That would break cases like unit test projects, which don't have a manifest.json file. --- src/SMAPI.ModBuildConfig/DeployModTask.cs | 66 ++++++++++++----------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/src/SMAPI.ModBuildConfig/DeployModTask.cs b/src/SMAPI.ModBuildConfig/DeployModTask.cs index 70761a2f..1581b282 100644 --- a/src/SMAPI.ModBuildConfig/DeployModTask.cs +++ b/src/SMAPI.ModBuildConfig/DeployModTask.cs @@ -79,38 +79,44 @@ namespace StardewModdingAPI.ModBuildConfig this.Log.LogMessage(MessageImportance.High, $"[mod build package] Handling build with options {string.Join(", ", properties)}"); } - // check if manifest file exists - FileInfo manifestFile = new(Path.Combine(this.ProjectDir, "manifest.json")); - if (!manifestFile.Exists) - { - this.Log.LogError("[mod build package] The mod does not have a manifest.json file."); - return false; - } - - // check if the json is valid - Manifest manifest; - try - { - new JsonHelper().ReadJsonFileIfExists(manifestFile.FullName, out manifest); - } - catch (JsonReaderException ex) - { - // log the inner exception, otherwise the message will be generic - Exception exToShow = ex.InnerException ?? ex; - this.Log.LogError($"[mod build package] Failed to parse manifest.json: {exToShow.Message}"); - return false; - } - - // validate the manifest's fields - if (!ManifestValidator.TryValidate(manifest, out string error)) - { - this.Log.LogError($"[mod build package] The mod manifest is invalid: {error}"); - return false; - } - + // skip if nothing to do + // (This must be checked before the manifest validation, to allow cases like unit test projects.) if (!this.EnableModDeploy && !this.EnableModZip) - return true; // nothing to do + return true; + // validate the manifest file + Manifest manifest; + { + // check if manifest file exists + FileInfo manifestFile = new(Path.Combine(this.ProjectDir, "manifest.json")); + if (!manifestFile.Exists) + { + this.Log.LogError("[mod build package] The mod does not have a manifest.json file."); + return false; + } + + // check if the json is valid + try + { + new JsonHelper().ReadJsonFileIfExists(manifestFile.FullName, out manifest); + } + catch (JsonReaderException ex) + { + // log the inner exception, otherwise the message will be generic + Exception exToShow = ex.InnerException ?? ex; + this.Log.LogError($"[mod build package] Failed to parse manifest.json: {exToShow.Message}"); + return false; + } + + // validate the manifest's fields + if (!ManifestValidator.TryValidate(manifest, out string error)) + { + this.Log.LogError($"[mod build package] The mod manifest is invalid: {error}"); + return false; + } + } + + // deploy files try { // parse extra DLLs to bundle