Finish renaming SequenceTable.AdvertiseExecuteSequence.
Sean Hall committed
Nov 25, 2019 at 16:03 UTC
9d9bb59efb71068f978dce42c95b4f0a472bb31e
4 files changed
+35
-20
src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+14
-14
@@ -369,13 +369,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
369
set.Add("AdminUISequence/FileCost");
370
371
// AdvtExecuteSequence table
372
- set.Add("AdvtExecuteSequence/CostFinalize");
373
- set.Add("AdvtExecuteSequence/CostInitialize");
374
- set.Add("AdvtExecuteSequence/InstallInitialize");
375
- set.Add("AdvtExecuteSequence/InstallFinalize");
376
- set.Add("AdvtExecuteSequence/InstallValidate");
377
- set.Add("AdvtExecuteSequence/PublishFeatures");
378
- set.Add("AdvtExecuteSequence/PublishProduct");
372
+ set.Add("AdvertiseExecuteSequence/CostFinalize");
373
+ set.Add("AdvertiseExecuteSequence/CostInitialize");
374
+ set.Add("AdvertiseExecuteSequence/InstallInitialize");
375
+ set.Add("AdvertiseExecuteSequence/InstallFinalize");
376
+ set.Add("AdvertiseExecuteSequence/InstallValidate");
377
+ set.Add("AdvertiseExecuteSequence/PublishFeatures");
378
+ set.Add("AdvertiseExecuteSequence/PublishProduct");
379
380
// InstallExecuteSequence table
381
set.Add("InstallExecuteSequence/CostFinalize");
@@ -418,7 +418,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
418
set.Add("InstallUISequence/RMCCPSearch");
419
break;
420
case TupleDefinitionType.Class:
421
- set.Add("AdvtExecuteSequence/RegisterClassInfo");
421
+ set.Add("AdvertiseExecuteSequence/RegisterClassInfo");
422
set.Add("InstallExecuteSequence/RegisterClassInfo");
423
set.Add("InstallExecuteSequence/UnregisterClassInfo");
424
break;
@@ -439,7 +439,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
439
set.Add("InstallExecuteSequence/RemoveEnvironmentStrings");
440
break;
441
case TupleDefinitionType.Extension:
442
- set.Add("AdvtExecuteSequence/RegisterExtensionInfo");
442
+ set.Add("AdvertiseExecuteSequence/RegisterExtensionInfo");
443
set.Add("InstallExecuteSequence/RegisterExtensionInfo");
444
set.Add("InstallExecuteSequence/UnregisterExtensionInfo");
445
break;
@@ -486,7 +486,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
486
set.Add("InstallUISequence/LaunchConditions");
487
break;
488
case TupleDefinitionType.MIME:
489
- set.Add("AdvtExecuteSequence/RegisterMIMEInfo");
489
+ set.Add("AdvertiseExecuteSequence/RegisterMIMEInfo");
490
set.Add("InstallExecuteSequence/RegisterMIMEInfo");
491
set.Add("InstallExecuteSequence/UnregisterMIMEInfo");
492
break;
@@ -494,7 +494,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
494
set.Add("InstallExecuteSequence/MoveFiles");
495
break;
496
case TupleDefinitionType.Assembly:
497
- set.Add("AdvtExecuteSequence/MsiPublishAssemblies");
497
+ set.Add("AdvertiseExecuteSequence/MsiPublishAssemblies");
498
set.Add("InstallExecuteSequence/MsiPublishAssemblies");
499
set.Add("InstallExecuteSequence/MsiUnpublishAssemblies");
500
break;
@@ -510,12 +510,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
510
set.Add("InstallExecuteSequence/RemoveODBC");
511
break;
512
case TupleDefinitionType.ProgId:
513
- set.Add("AdvtExecuteSequence/RegisterProgIdInfo");
513
+ set.Add("AdvertiseExecuteSequence/RegisterProgIdInfo");
514
set.Add("InstallExecuteSequence/RegisterProgIdInfo");
515
set.Add("InstallExecuteSequence/UnregisterProgIdInfo");
516
break;
517
case TupleDefinitionType.PublishComponent:
518
- set.Add("AdvtExecuteSequence/PublishComponents");
518
+ set.Add("AdvertiseExecuteSequence/PublishComponents");
519
set.Add("InstallExecuteSequence/PublishComponents");
520
set.Add("InstallExecuteSequence/UnpublishComponents");
521
break;
@@ -536,7 +536,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
536
set.Add("InstallExecuteSequence/InstallServices");
537
break;
538
case TupleDefinitionType.Shortcut:
539
- set.Add("AdvtExecuteSequence/CreateShortcuts");
539
+ set.Add("AdvertiseExecuteSequence/CreateShortcuts");
540
set.Add("InstallExecuteSequence/CreateShortcuts");
541
set.Add("InstallExecuteSequence/RemoveShortcuts");
542
break;
src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+19
-4
@@ -2470,14 +2470,16 @@ namespace WixToolset.Core.WindowsInstaller
2470
{
2471
foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable)))
2472
{
2473
+ var sequenceTableName = GetSequenceTableName(sequenceTable);
2474
+
2475
// if suppressing UI elements, skip UI-related sequence tables
2474
- if (this.SuppressUI && ("AdminUISequence" == sequenceTable.ToString() || "InstallUISequence" == sequenceTable.ToString()))
2476
+ if (this.SuppressUI && ("AdminUISequence" == sequenceTableName || "InstallUISequence" == sequenceTableName))
2477
{
2478
continue;
2479
}
2480
2481
var actionsTable = new Table(this.tableDefinitions["WixAction"]);
2480
- var table = tables[sequenceTable.ToString()];
2482
+ var table = tables[sequenceTableName];
2483
2484
if (null != table)
2485
{
@@ -2607,14 +2609,16 @@ namespace WixToolset.Core.WindowsInstaller
2609
{
2610
foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable)))
2611
{
2612
+ var sequenceTableName = GetSequenceTableName(sequenceTable);
2613
+
2614
// if suppressing UI elements, skip UI-related sequence tables
2611
- if (this.SuppressUI && ("AdminUISequence" == sequenceTable.ToString() || "InstallUISequence" == sequenceTable.ToString()))
2615
+ if (this.SuppressUI && ("AdminUISequence" == sequenceTableName || "InstallUISequence" == sequenceTableName))
2616
{
2617
continue;
2618
}
2619
2620
var actionsTable = new Table(this.tableDefinitions["WixAction"]);
2617
- var table = tables[String.Concat("Module", sequenceTable.ToString())];
2621
+ var table = tables[String.Concat("Module", sequenceTableName)];
2622
2623
if (null != table)
2624
{
@@ -2813,6 +2817,17 @@ namespace WixToolset.Core.WindowsInstaller
2817
}
2818
}
2819
2820
+ private static string GetSequenceTableName(SequenceTable sequenceTable)
2821
+ {
2822
+ switch (sequenceTable)
2823
+ {
2824
+ case SequenceTable.AdvertiseExecuteSequence:
2825
+ return "AdvtExecuteSequence";
2826
+ default:
2827
+ return sequenceTable.ToString();
2828
+ }
2829
+ }
2830
+
2831
/// <summary>
2832
/// Get the path to a file in the source image.
2833
/// </summary>
src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+1
-1
@@ -125,7 +125,7 @@ namespace WixToolsetTest.CoreIntegration
125
}
126
}
127
128
- [Fact(Skip = "Test demonstrates failure")]
128
+ [Fact]
129
public void CanDecompileSequenceTables()
130
{
131
var folder = TestData.Get(@"TestData\SequenceTables");
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+1
-1
@@ -252,7 +252,7 @@ namespace WixToolsetTest.CoreIntegration
252
}
253
}
254
255
- [Fact(Skip = "Test demonstrates failure")]
255
+ [Fact]
256
public void PopulatesCustomActionTable()
257
{
258
var folder = TestData.Get(@"TestData");