Merge branch 'develop' into stable

Author: Pathoschild

docs/technical/mod-package-release-notes.md

@@ -1,6 +1,11 @@
 ← [mod build config](./mod-build-config.md)
 
 ## Release notes
+# 4.3.2
+Released 09 November 2024 for SMAPI 4.1.0 or later.
+
+* Fixed `IgnoreModFilePaths` and `IgnoreModFilePatterns` not working correctly in recent versions.
+
 ## 4.3.1
 Released 04 November 2024 for SMAPI 4.1.0 or later.
 

src/SMAPI.ModBuildConfig/DeployModTask.cs

@@ -123,8 +123,8 @@ public override bool Execute()
             ExtraAssemblyTypes bundleAssemblyTypes = this.GetExtraAssembliesToBundleOption();
 
             // parse ignore patterns
-            string[] ignoreFilePaths = this.GetCustomIgnoreFilePaths(this.IgnoreModFilePatterns).ToArray();
-            Regex[] ignoreFilePatterns = this.GetCustomIgnorePatterns(this.IgnoreModFilePaths).ToArray();
+            string[] ignoreFilePaths = this.GetCustomIgnoreFilePaths(this.IgnoreModFilePaths).ToArray();
+            Regex[] ignoreFilePatterns = this.GetCustomIgnorePatterns(this.IgnoreModFilePatterns).ToArray();
 
             var modPackages = new Dictionary<string, IModFileManager>
             {
@@ -149,8 +149,8 @@ public override bool Execute()
                     string version = item.GetMetadata("Version");
 
                     // get options
-                    ignoreFilePaths = this.GetCustomIgnoreFilePaths(item.GetMetadata("IgnoreModFilePatterns")).ToArray();
-                    ignoreFilePatterns = this.GetCustomIgnorePatterns(this.IgnoreModFilePaths).ToArray();
+                    ignoreFilePaths = this.GetCustomIgnoreFilePaths(item.GetMetadata("IgnoreModFilePaths")).ToArray();
+                    ignoreFilePatterns = this.GetCustomIgnorePatterns(item.GetMetadata("IgnoreModFilePatterns")).ToArray();
                     string rawValidateManifest = item.GetMetadata("ValidateManifest");
                     bool validateManifest = string.IsNullOrEmpty(rawValidateManifest) || bool.Parse(rawValidateManifest);
 

src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj

@@ -10,9 +10,9 @@
     <!--NuGet package-->
     <PackageId>Pathoschild.Stardew.ModBuildConfig</PackageId>
     <Title>Build package for SMAPI mods</Title>
-    <Version>4.3.1</Version>
+    <Version>4.3.2</Version>
     <Authors>Pathoschild</Authors>
-    <Description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods. For SMAPI 3.13.0 or later.</Description>
+    <Description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods. For SMAPI 4.1.0 or later.</Description>
     <PackageReadmeFile>mod-package.md</PackageReadmeFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>images/icon.png</PackageIcon>