From ab8d368fe8e7a41e503ec295b196035922293ef4 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 27 Apr 2023 21:06:35 -0400
Subject: Fix XmlConfig lookup logic.

Fixes https://github.com/wixtoolset/issues/issues/7377.
Requires fix for https://github.com/wixtoolset/issues/issues/7444.
---
 .../TestData/XmlConfig/Package.wxs                 | 22 ++++++++++++++++------
 .../WixToolsetTest.Util/TestData/XmlConfig/my.xml  | 11 +++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/my.xml

(limited to 'src/ext/Util/test/WixToolsetTest.Util/TestData')

diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
index a2002634..cb132960 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
@@ -1,17 +1,27 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+            <Component Directory="INSTALLFOLDER">
+                <File Id="MyXmlFile" Source="my.xml" />
+            </Component>
+            
             <Component Id="Del" Directory="INSTALLFOLDER" Guid="3613414c-11f5-40fa-a1f1-a0ba722a6895">
-                <util:XmlConfig Id="DelElement" File="[INSTALLFOLDER]my.xml" Action="delete" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
+                <util:XmlConfig Id="DelElement" File="[#MyXmlFile]" Action="delete" Node="element" VerifyPath="grandchild1" ElementPath="//root/child1" On="install" />
+            </Component>
+
+            <Component Id="Add" Directory="INSTALLFOLDER" Guid="30A9FF8B-7AC8-47F3-BB24-9EA81AA38856">
+                <util:XmlConfig Id="AddElement" File="[#MyXmlFile]" Action="create" Node="element" ElementPath="//root/child2" Name="grandchild3" On="install" Sequence="2" />
+                <util:XmlConfig ElementId="AddElement" File="[#MyXmlFile]" Name="TheAttribute1" Value="AttributeValue1" Sequence="3" />
+                <util:XmlConfig Id="AddAttribute2" ElementId="AddElement" File="[INSTALLFOLDER]my.xml" Name="TheAttribute2" Value="AttributeValue2" Sequence="4" />
             </Component>
         </Feature>
     </Package>
 
     <Fragment>
-            <StandardDirectory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </StandardDirectory>
-        </Fragment>
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+        </StandardDirectory>
+    </Fragment>
 </Wix>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/my.xml b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/my.xml
new file mode 100644
index 00000000..3f44c27c
--- /dev/null
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/my.xml
@@ -0,0 +1,11 @@
+<root>
+    <child1>
+        <grandchild1>
+        </grandchild1>
+    </child1>
+
+    <child2>
+        <grandchild2>
+        </grandchild2>
+    </child2>
+</root>
-- 
cgit v1.2.3-55-g6feb