Integrate the IntermediateSection and IntermediateSymbol mutable changes

1 files changed, 12 insertions, 15 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
index 6d802d98..5f8df92c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
@@ -241,23 +241,20 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             foreach (var section in this.Intermediate.Sections)
             {
-                for (var i = section.Symbols.Count - 1; i >= 0; i--)
+                // Remove all summary information from the symbols and remember those that
+                // are not calculated or reserved.
+                foreach (var patchSummaryInfo in section.Symbols.OfType<SummaryInformationSymbol>().ToList())
                 {
-                    if (section.Symbols[i] is SummaryInformationSymbol patchSummaryInfo)
+                    section.RemoveSymbol(patchSummaryInfo);
+
+                    if (patchSummaryInfo.PropertyId != SummaryInformationType.PatchProductCodes &&
+                        patchSummaryInfo.PropertyId != SummaryInformationType.PatchCode &&
+                        patchSummaryInfo.PropertyId != SummaryInformationType.PatchInstallerRequirement &&
+                        patchSummaryInfo.PropertyId != SummaryInformationType.Reserved11 &&
+                        patchSummaryInfo.PropertyId != SummaryInformationType.Reserved14 &&
+                        patchSummaryInfo.PropertyId != SummaryInformationType.Reserved16)
                     {
-                        // Remove all summary information from the symbols and remember those that
-                        // are not calculated or reserved.
-                        section.Symbols.RemoveAt(i);
-
-                        if (patchSummaryInfo.PropertyId != SummaryInformationType.PatchProductCodes &&
-                            patchSummaryInfo.PropertyId != SummaryInformationType.PatchCode &&
-                            patchSummaryInfo.PropertyId != SummaryInformationType.PatchInstallerRequirement &&
-                            patchSummaryInfo.PropertyId != SummaryInformationType.Reserved11 &&
-                            patchSummaryInfo.PropertyId != SummaryInformationType.Reserved14 &&
-                            patchSummaryInfo.PropertyId != SummaryInformationType.Reserved16)
-                        {
-                            result.Add(patchSummaryInfo.PropertyId, patchSummaryInfo);
-                        }
+                        result.Add(patchSummaryInfo.PropertyId, patchSummaryInfo);
                     }
                 }
             }