From 32dcdfe18c634804983f130c0b7bac4bddca93f7 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 16 Sep 2021 17:27:27 -0400 Subject: tweak assembly ignore logic in mod build package --- .../Framework/ModFileManager.cs | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/SMAPI.ModBuildConfig/Framework') diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs index 6dd595e5..7a1ed7a4 100644 --- a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs +++ b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs @@ -152,22 +152,22 @@ namespace StardewModdingAPI.ModBuildConfig.Framework /// Custom regex patterns matching files to ignore when deploying or zipping the mod. private bool ShouldIgnore(FileInfo file, string relativePath, Regex[] ignoreFilePatterns) { + bool IsAssemblyFile(string baseName) + { + return + this.EqualsInvariant(file.Name, $"{baseName}.dll") + || this.EqualsInvariant(file.Name, $"{baseName}.pdb") + || this.EqualsInvariant(file.Name, $"{baseName}.xnb"); + } + return // release zips this.EqualsInvariant(file.Extension, ".zip") - // Harmony (bundled into SMAPI) - || this.EqualsInvariant(file.Name, "0Harmony.dll") - - // Json.NET (bundled into SMAPI) - || this.EqualsInvariant(file.Name, "Newtonsoft.Json.dll") - || this.EqualsInvariant(file.Name, "Newtonsoft.Json.pdb") - || this.EqualsInvariant(file.Name, "Newtonsoft.Json.xml") - - // mod translation class builder (not used at runtime) - || this.EqualsInvariant(file.Name, "Pathoschild.Stardew.ModTranslationClassBuilder.dll") - || this.EqualsInvariant(file.Name, "Pathoschild.Stardew.ModTranslationClassBuilder.pdb") - || this.EqualsInvariant(file.Name, "Pathoschild.Stardew.ModTranslationClassBuilder.xml") + // dependencies bundled with SMAPI + || IsAssemblyFile("0Harmony") + || IsAssemblyFile("Newtonsoft.Json") + || IsAssemblyFile("Pathoschild.Stardew.ModTranslationClassBuilder") // not used at runtime // code analysis files || file.Name.EndsWith(".CodeAnalysisLog.xml", StringComparison.OrdinalIgnoreCase) -- cgit