Modularize XmlConfig/@ElementId and add tests for XmlConfig

Fixes wixtoolset/issues#4698
Closes wixtoolset/issues#5447

1 files changed, 8 insertions, 0 deletions

diff --git a/src/wixext/Symbols/XmlConfigSymbol.cs b/src/wixext/Symbols/XmlConfigSymbol.cs
index ca1cf047..6503a586 100644
--- a/src/wixext/Symbols/XmlConfigSymbol.cs
+++ b/src/wixext/Symbols/XmlConfigSymbol.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Util
             new[]
             {
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String),
@@ -31,6 +32,7 @@ namespace WixToolset.Util.Symbols
     public enum XmlConfigSymbolFields
     {
         File,
+        ElementId,
         ElementPath,
         VerifyPath,
         Name,
@@ -58,6 +60,12 @@ namespace WixToolset.Util.Symbols
             set => this.Set((int)XmlConfigSymbolFields.File, value);
         }
 
+        public string ElementId
+        {
+            get => this.Fields[(int)XmlConfigSymbolFields.ElementId].AsString();
+            set => this.Set((int)XmlConfigSymbolFields.ElementId, value);
+        }
+
         public string ElementPath
         {
             get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString();