Skip to content

Commit d2ef95f

Browse files
committed
DirectorySearch has default Id so test it.
"Fixes" wixtoolset/issues#9112
1 parent c3bd911 commit d2ef95f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,13 @@ public void PopulatesAppSearchTablesFromDirectorySearch()
7070

7171
Assert.True(File.Exists(msiPath));
7272
var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "DrLocator" });
73-
WixAssert.CompareLineByLine(new[]
74-
{
73+
WixAssert.CompareLineByLine(
74+
[
75+
"AppSearch:EXAMPLEDIRFOUND\tdircdo7ICRtQ3CvoztHSvflmt6yVh4",
7576
"AppSearch:SAMPLEDIRFOUND\tSampleDirSearch",
77+
"DrLocator:dircdo7ICRtQ3CvoztHSvflmt6yVh4\t\tC:\\ExampleDir\t",
7678
"DrLocator:SampleDirSearch\t\tC:\\SampleDir\t",
77-
}, results);
79+
], results);
7880
}
7981
}
8082

src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DirectorySearch.wxs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
33
<Fragment>
44
<ComponentGroup Id="ProductComponents">
5-
<ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
5+
<ComponentGroupRef Id="MinimalComponentGroup" />
66
</ComponentGroup>
77

88
<Property Id="SAMPLEDIRFOUND">
9-
<DirectorySearch Id="SampleDirSearch" AssignToProperty="yes" Path="C:\SampleDir"></DirectorySearch>
9+
<DirectorySearch Id="SampleDirSearch" AssignToProperty="yes" Path="C:\SampleDir" />
10+
</Property>
11+
12+
<Property Id="EXAMPLEDIRFOUND">
13+
<DirectorySearch AssignToProperty="yes" Path="C:\ExampleDir" />
1014
</Property>
1115
</Fragment>
1216
</Wix>

0 commit comments

Comments
 (0)