Several fixes
Rob Mensching committed
Oct 16, 2019 at 17:04 UTC
7d699fdbbe8a15c72b69f633ac9799fb757e2acc
6 files changed
+26
-15
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+4
@@ -117,6 +117,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
117
this.AddMsiServiceConfigFailureActionsTuple((MsiServiceConfigFailureActionsTuple)tuple, output);
118
break;
119
120
+ case TupleDefinitionType.MsiShortcutProperty:
121
+ this.AddTupleDefaultly(tuple, output, true);
122
+ break;
123
+
124
case TupleDefinitionType.MoveFile:
125
this.AddMoveFileTuple((MoveFileTuple)tuple, output);
126
break;
src/WixToolset.Core/Compiler_2.cs
+3
-2
@@ -1297,7 +1297,7 @@ namespace WixToolset.Core
1297
{
1298
this.Core.Write(ErrorMessages.AdvertiseStateMustMatch(sourceLineNumbers, advertise.ToString(), progIdAdvertise.ToString()));
1299
}
1300
- else
1300
+ else if (YesNoType.NotSet != progIdAdvertise)
1301
{
1302
advertise = progIdAdvertise;
1303
}
@@ -2020,6 +2020,7 @@ namespace WixToolset.Core
2020
var tuple = new RegistryTuple(sourceLineNumbers, id)
2021
{
2022
Root = root.Value,
2023
+ Key = key,
2024
Name = name,
2025
Value = value,
2026
ValueType = valueType,
@@ -4923,7 +4924,7 @@ namespace WixToolset.Core
4924
4925
// Ensure that RemoveExistingProducts is authored in InstallExecuteSequence
4926
// if at least one row in Upgrade table lacks the OnlyDetect attribute.
4926
- if (onlyDetect)
4927
+ if (!onlyDetect)
4928
{
4929
this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", "InstallExecuteSequence", "RemoveExistingProducts");
4930
}
src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+1
-1
@@ -13,7 +13,7 @@ namespace WixToolsetTest.CoreIntegration
13
14
public class LinkerFixture
15
{
16
- [Fact(Skip = "Test demonstrates failure")]
16
+ [Fact]
17
public void CanBuildWithOverridableActions()
18
{
19
var folder = TestData.Get(@"TestData\OverridableActions");
src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+12
-6
@@ -608,7 +608,7 @@ namespace WixToolsetTest.CoreIntegration
608
}
609
}
610
611
- [Fact(Skip = "Test demonstrates failure")]
611
+ [Fact]
612
public void CanBuildVersionIndependentProgId()
613
{
614
var folder = TestData.Get(@"TestData\ProgId");
@@ -639,11 +639,17 @@ namespace WixToolsetTest.CoreIntegration
639
var section = intermediate.Sections.Single();
640
641
var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList();
642
- Assert.Equal(2, progids.Count);
643
- Assert.Equal("Foo.File.hol", progids[0].ProgId);
644
- Assert.Equal("Foo.File.hol.15", progids[0].ParentProgIdRef);
645
- Assert.Equal("Foo.File.hol.15", progids[1].ProgId);
646
- Assert.Null(progids[1].ParentProgIdRef);
642
+ Assert.Equal(new[]
643
+ {
644
+ "Foo.File.hol",
645
+ "Foo.File.hol.15"
646
+ }, progids.Select(p => p.ProgId).ToArray());
647
+
648
+ Assert.Equal(new[]
649
+ {
650
+ "Foo.File.hol.15",
651
+ null
652
+ }, progids.Select(p => p.ParentProgIdRef).ToArray());
653
}
654
}
655
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+4
-4
@@ -181,7 +181,7 @@ namespace WixToolsetTest.CoreIntegration
181
}
182
}
183
184
- [Fact(Skip = "Test demonstrates failure")]
184
+ [Fact]
185
public void PopulatesClassTablesWhenProgIdIsNestedUnderAdvertisedClass()
186
{
187
var folder = TestData.Get(@"TestData");
@@ -396,7 +396,7 @@ namespace WixToolsetTest.CoreIntegration
396
}
397
}
398
399
- [Fact(Skip = "Test demonstrates failure")]
399
+ [Fact]
400
public void PopulatesInstallExecuteSequenceTable()
401
{
402
var folder = TestData.Get(@"TestData");
@@ -516,7 +516,7 @@ namespace WixToolsetTest.CoreIntegration
516
}
517
}
518
519
- [Fact(Skip = "Test demonstrates failure")]
519
+ [Fact]
520
public void PopulatesMsiShortcutPropertyTable()
521
{
522
var folder = TestData.Get(@"TestData");
@@ -549,7 +549,7 @@ namespace WixToolsetTest.CoreIntegration
549
}
550
}
551
552
- [Fact(Skip = "Test demonstrates failure")]
552
+ [Fact]
553
public void PopulatesRegistryTableFromRegistryValue()
554
{
555
var folder = TestData.Get(@"TestData");
src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
+2
-2
@@ -12,8 +12,8 @@ namespace WixToolsetTest.CoreIntegration
12
13
public class WixlibQueryFixture
14
{
15
- [Fact(Skip = "Test demonstrates failure")]
16
- public void DetectOnlyUpgradeProducesReferenceToRemoveExistingProducts()
15
+ [Fact]
16
+ public void UpgradeProducesReferenceToRemoveExistingProducts()
17
{
18
var folder = TestData.Get(@"TestData\Upgrade");
19