Fix ?foreach? so all loop values get "executed."

1 files changed, 15 insertions, 13 deletions

diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs
index acba0b5f..9f0ab1bb 100644
--- a/src/WixToolset.Core/Preprocessor.cs
+++ b/src/WixToolset.Core/Preprocessor.cs
@@ -762,25 +762,27 @@ namespace WixToolset.Core
             }
 
             using (var fragmentStream = new MemoryStream(Encoding.UTF8.GetBytes(fragmentBuilder.ToString())))
-            using (var loopReader = XmlReader.Create(fragmentStream, FragmentXmlReaderSettings))
             {
                 // process each iteration, updating the variable's value each time
                 foreach (string varValue in varValues)
                 {
-                    // Always overwrite foreach variables.
-                    this.Helper.AddVariable(this.Context, varName, varValue, false);
-
-                    try
-                    {
-                        this.PreprocessReader(false, loopReader, container, offset);
-                    }
-                    catch (XmlException e)
+                    using (var loopReader = XmlReader.Create(fragmentStream, FragmentXmlReaderSettings))
                     {
-                        this.UpdateCurrentLineNumber(loopReader, offset);
-                        throw new WixException(ErrorMessages.InvalidXml(this.Context.CurrentSourceLineNumber, "source", e.Message));
-                    }
+                        // Always overwrite foreach variables.
+                        this.Helper.AddVariable(this.Context, varName, varValue, false);
 
-                    fragmentStream.Position = 0; // seek back to the beginning for the next loop.
+                        try
+                        {
+                            this.PreprocessReader(false, loopReader, container, offset);
+                        }
+                        catch (XmlException e)
+                        {
+                            this.UpdateCurrentLineNumber(loopReader, offset);
+                            throw new WixException(ErrorMessages.InvalidXml(this.Context.CurrentSourceLineNumber, "source", e.Message));
+                        }
+
+                        fragmentStream.Position = 0; // seek back to the beginning for the next loop.
+                    }
                 }
             }
         }