Fix AppSearch related building
Rob Mensching committed
Oct 7, 2019 at 13:21 UTC
d3b12de2f22eb552e073f0c949833a7ef4d4f13c
3 files changed
+15
-8
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+5
-1
@@ -152,6 +152,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
152
case TupleDefinitionType.Shortcut:
153
this.AddShortcutTuple((ShortcutTuple)tuple, output);
154
break;
155
+
156
+ case TupleDefinitionType.Signature:
157
+ this.AddTupleDefaultly(tuple, output, true);
158
+ break;
159
160
case TupleDefinitionType.SummaryInformation:
161
this.AddTupleDefaultly(tuple, output, tableName: "_SummaryInformation");
@@ -917,7 +921,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
921
{
922
if (i < tableDefinition.Columns.Length)
923
{
920
- var column = tableDefinition.Columns[i];
924
+ var column = tableDefinition.Columns[i + rowOffset];
925
926
switch (column.Type)
927
{
src/WixToolset.Core/Compiler.cs
+5
-2
@@ -322,8 +322,9 @@ namespace WixToolset.Core
322
this.Core.Write(ErrorMessages.SearchPropertyNotUppercase(sourceLineNumbers, "Property", "Id", propertyId.Id));
323
}
324
325
- var tuple = new AppSearchTuple(sourceLineNumbers, propertyId)
325
+ var tuple = new AppSearchTuple(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature))
326
{
327
+ PropertyRef = propertyId.Id,
328
SignatureRef = signature
329
};
330
@@ -2905,6 +2906,7 @@ namespace WixToolset.Core
2906
{
2907
var tuple = new CompLocatorTuple(sourceLineNumbers, id)
2908
{
2909
+ SignatureRef = id.Id,
2910
ComponentId = componentId,
2911
Type = type,
2912
};
@@ -4482,7 +4484,7 @@ namespace WixToolset.Core
4484
signature = id.Id;
4485
}
4486
4485
- var tuple = new DrLocatorTuple(sourceLineNumbers)
4487
+ var tuple = new DrLocatorTuple(sourceLineNumbers, new Identifier(access, rowId, parentSignature, path))
4488
{
4489
SignatureRef = rowId,
4490
Parent = parentSignature,
@@ -6793,6 +6795,7 @@ namespace WixToolset.Core
6795
{
6796
var tuple = new IniLocatorTuple(sourceLineNumbers, id)
6797
{
6798
+ SignatureRef = id.Id,
6799
FileName = this.GetMsiFilenameValue(shortName, name),
6800
Section = section,
6801
Key = key,
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+5
-5
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
9
10
public class MsiQueryFixture
11
{
12
- [Fact(Skip = "Test demonstrates failure")]
12
+ [Fact]
13
public void PopulatesAppSearchTablesFromComponentSearch()
14
{
15
var folder = TestData.Get(@"TestData");
@@ -43,7 +43,7 @@ namespace WixToolsetTest.CoreIntegration
43
}
44
}
45
46
- [Fact(Skip = "Test demonstrates failure")]
46
+ [Fact]
47
public void PopulatesAppSearchTablesFromDirectorySearch()
48
{
49
var folder = TestData.Get(@"TestData");
@@ -71,13 +71,13 @@ namespace WixToolsetTest.CoreIntegration
71
var results = Query.QueryDatabase(msiPath, new[] { "AppSearch", "DrLocator" });
72
Assert.Equal(new[]
73
{
74
- "AppSearch:SAMPLECOMPFOUND\tSampleCompSearch",
74
+ "AppSearch:SAMPLEDIRFOUND\tSampleDirSearch",
75
"DrLocator:SampleDirSearch\t\tC:\\SampleDir\t",
76
}, results);
77
}
78
}
79
80
- [Fact(Skip = "Test demonstrates failure")]
80
+ [Fact]
81
public void PopulatesAppSearchTablesFromFileSearch()
82
{
83
var folder = TestData.Get(@"TestData");
@@ -112,7 +112,7 @@ namespace WixToolsetTest.CoreIntegration
112
}
113
}
114
115
- [Fact(Skip = "Test demonstrates failure")]
115
+ [Fact]
116
public void PopulatesAppSearchTablesFromRegistrySearch()
117
{
118
var folder = TestData.Get(@"TestData");