azp: fix each expression variable scope (#634)

Author: ChristopherHX

src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateUnraveler.cs

@@ -476,7 +476,6 @@ m_current.Parent is BasicExpressionState &&
                         m_current.Remove();
                         if(eachExpressionState.IsEnd) {
                             m_current = m_current.Parent; // Skip to the expression end
-                            m_context.ExpressionValues.Remove(eachExpressionState.Value.Variable);
                         } else {
                             m_current = eachExpressionState.MoveNext(m_context);
                         }
@@ -619,6 +618,7 @@ m_current.Parent is MappingState parentMappingState &&
                     // Expression end
                     else if (eachExpressionState.IsEnd)
                     {
+                        m_context.ExpressionValues.Remove(eachExpressionState.Value.Variable);
                         EndExpression();
                     }
                     // Not allowed

testworkflows/azpipelines/issue-633/pipeline.yml

@@ -0,0 +1,34 @@
+parameters:
+- name: buildConfigurations
+  type: object
+  default:
+  - platform: win32
+    configuration: Debug
+    
+jobs:
+- job: Initialization
+  steps:
+  - script: echo 'init'
+- job: Buildwin32_Debug
+  steps:
+  - script: echo 'build'
+- job: x
+  variables:
+    ${{ each buildConfiguration in parameters.buildConfigurations}}:
+      Config_${{ buildConfiguration.platform }}_${{ buildConfiguration.configuration }}: ${{ buildConfiguration.platform }}_${{ buildConfiguration.configuration }}
+  dependsOn:
+  - Initialization
+  - ${{ each buildConfiguration in parameters.buildConfigurations }}:
+    - Build${{ buildConfiguration.platform }}_${{ buildConfiguration.configuration }}
+  steps:
+  - script: echo 'help'
+- job: y
+  dependsOn:
+  - Initialization
+  - ${{ each buildConfiguration in parameters.buildConfigurations }}:
+    - Build${{ buildConfiguration.platform }}_${{ buildConfiguration.configuration }}
+  steps:
+  - script: echo 'help'
+  variables:
+    ${{ each buildConfiguration in parameters.buildConfigurations}}:
+      Config_${{ buildConfiguration.platform }}_${{ buildConfiguration.configuration }}: ${{ buildConfiguration.platform }}_${{ buildConfiguration.configuration }}