Merge branch 'develop' into stable

Pathoschild · May 24, 2024 · 55aee0f · 55aee0f
2 parents 1ca1411 + 8cce961
commit 55aee0f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/ContentPatcher/ContentPatcher.csproj b/ContentPatcher/ContentPatcher.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.1.1</Version>
+    <Version>2.1.2</Version>
     <RootNamespace>ContentPatcher</RootNamespace>
   </PropertyGroup>
 

diff --git a/ContentPatcher/Framework/Migrations/AggregateMigration.cs b/ContentPatcher/Framework/Migrations/AggregateMigration.cs
@@ -167,7 +167,7 @@ public bool TryMigrate(Condition condition, [NotNullWhen(false)] out string? err
             IAssetName? target = null;
 
             foreach (IRuntimeMigration migration in this.RuntimeMigrations)
-                target = migration.RedirectTarget(target ?? assetName, patch);
+                target = migration.RedirectTarget(target ?? assetName, patch) ?? target;
 
             return target;
         }

diff --git a/ContentPatcher/Framework/Migrations/Migration_2_1.cs b/ContentPatcher/Framework/Migrations/Migration_2_1.cs
@@ -6,7 +6,7 @@ namespace ContentPatcher.Framework.Migrations
 {
     /// <summary>Migrates patches to format version 2.1.</summary>
     [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Named for clarity.")]
-    internal partial class Migration_2_1 : BaseRuntimeMigration
+    internal partial class Migration_2_1 : BaseMigration
     {
         /*********
         ** Public methods

diff --git a/ContentPatcher/Framework/PatchManager.cs b/ContentPatcher/Framework/PatchManager.cs
@@ -444,7 +444,11 @@ public IEnumerable<IPatch> GetCurrentEditors(AssetRequestedEventArgs request)
                 .Where(patch =>
                     patch.Type == patchType
                     && patch.IsReady
-                    && (patch.TargetLocale is null || string.Equals(patch.TargetLocale, request.Name.LocaleCode, StringComparison.InvariantCultureIgnoreCase))
+                    && (
+                        patch.PredatesTargetLocale
+                        || patch.TargetLocale is null
+                        || string.Equals(patch.TargetLocale, request.Name.LocaleCode, StringComparison.InvariantCultureIgnoreCase)
+                    )
                 );
         }
 

diff --git a/ContentPatcher/docs/release-notes.md b/ContentPatcher/docs/release-notes.md
@@ -9,6 +9,11 @@ When releasing a format change, don't forget to update the smapi.io/json schema!
 
 
 -->
+## 2.1.2
+Released 23 May 2024 for SMAPI 4.0.0 or later.
+
+* Fixed some older content packs broken in Content Patcher 2.1.0+.
+
 ## 2.1.1
 Released 23 May 2024 for SMAPI 4.0.0 or later.
 

diff --git a/ContentPatcher/manifest.json b/ContentPatcher/manifest.json
@@ -1,7 +1,7 @@
 {
     "Name": "Content Patcher",
     "Author": "Pathoschild",
-    "Version": "2.1.1",
+    "Version": "2.1.2",
     "MinimumApiVersion": "4.0.0",
     "Description": "Loads content packs which edit game data, images, and maps without changing the game files.",
     "UniqueID": "Pathoschild.ContentPatcher",