DirectorySearch has default Id so test it.HEADmain

"Fixes" https://github.com/wixtoolset/issues/issues/9112

2 files changed, 11 insertions, 5 deletions

diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 647f5b24..6b863142 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -70,11 +70,13 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(msiPath));
                 var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "DrLocator" });
-                WixAssert.CompareLineByLine(new[]
-                {
+                WixAssert.CompareLineByLine(
+                [
+                    "AppSearch:EXAMPLEDIRFOUND\tdircdo7ICRtQ3CvoztHSvflmt6yVh4",
                     "AppSearch:SAMPLEDIRFOUND\tSampleDirSearch",
+                    "DrLocator:dircdo7ICRtQ3CvoztHSvflmt6yVh4\t\tC:\\ExampleDir\t",
                     "DrLocator:SampleDirSearch\t\tC:\\SampleDir\t",
-                }, results);
+                ], results);
             }
         }
 
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs
index e255c83d..fbb8eaaf 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs
@@ -2,11 +2,15 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents">
-            <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
+            <ComponentGroupRef Id="MinimalComponentGroup" />
         </ComponentGroup>
 
         <Property Id="SAMPLEDIRFOUND">
-            <DirectorySearch Id="SampleDirSearch" AssignToProperty="yes" Path="C:\SampleDir"></DirectorySearch>
+            <DirectorySearch Id="SampleDirSearch" AssignToProperty="yes" Path="C:\SampleDir" />
+        </Property>
+
+        <Property Id="EXAMPLEDIRFOUND">
+            <DirectorySearch AssignToProperty="yes" Path="C:\ExampleDir" />
         </Property>
     </Fragment>
 </Wix>