- WiX4: Issue #1398: Underscore in String Id in wxl breaks localization

oleg-shilo · Dec 14, 2023 · 6e3463f · 6e3463f
1 parent 76870b6
commit 6e3463f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/src/WixSharp.UI/ManagedUI/ManagedUI.cs b/Source/src/WixSharp.UI/ManagedUI/ManagedUI.cs
@@ -216,12 +216,12 @@ internal static string LocalizationFileFor(Project project)
                         var replacementIds = userLocalization.Root.Elements().Select(x => x.Attr("Id"));
 
                         baseLocalization.Root
-                            .Elements().ToArray() // clone the copy so the collection is not impacted
+                            .Elements()
                             .Where(x => replacementIds.Contains(x.Attr("Id")))
                             .ForEach(x => x.Remove());
 
                         userLocalization.Root
-                            .Elements().ToArray() // clone the copy so the collection is not impacted
+                            .Elements()
                             .ForEach(x =>
                             {
                                 x.Remove();

diff --git a/Source/src/WixSharp/Extensions.cs b/Source/src/WixSharp/Extensions.cs
@@ -750,7 +750,8 @@ public static IEnumerable<T> DistinctBy<T>(this IEnumerable<T> list, Func<T, obj
         /// <returns></returns>
         public static IEnumerable<T> ForEach<T>(this IEnumerable<T> collection, Action<T> action)
         {
-            foreach (T item in collection)
+            // clone the copy so the collection is not impacted by the action
+            foreach (T item in collection.ToArray())
             {
                 action(item);
             }