aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Decompile
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2019-11-25 16:03:38 +1000
committerSean Hall <r.sean.hall@gmail.com>2019-11-25 18:06:33 +1000
commit9d9bb59efb71068f978dce42c95b4f0a472bb31e (patch)
tree88307f599da5e49d968dd1364ba5e036af3744b8 /src/WixToolset.Core.WindowsInstaller/Decompile
parentc41ab103681b6bfdfc4c51333bca133482207abb (diff)
downloadwix-9d9bb59efb71068f978dce42c95b4f0a472bb31e.tar.gz
wix-9d9bb59efb71068f978dce42c95b4f0a472bb31e.tar.bz2
wix-9d9bb59efb71068f978dce42c95b4f0a472bb31e.zip
Finish renaming SequenceTable.AdvertiseExecuteSequence.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Decompile')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 9ecad783..5afaace9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -2470,14 +2470,16 @@ namespace WixToolset.Core.WindowsInstaller
2470 { 2470 {
2471 foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable))) 2471 foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable)))
2472 { 2472 {
2473 var sequenceTableName = GetSequenceTableName(sequenceTable);
2474
2473 // if suppressing UI elements, skip UI-related sequence tables 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))
2475 { 2477 {
2476 continue; 2478 continue;
2477 } 2479 }
2478 2480
2479 var actionsTable = new Table(this.tableDefinitions["WixAction"]); 2481 var actionsTable = new Table(this.tableDefinitions["WixAction"]);
2480 var table = tables[sequenceTable.ToString()]; 2482 var table = tables[sequenceTableName];
2481 2483
2482 if (null != table) 2484 if (null != table)
2483 { 2485 {
@@ -2607,14 +2609,16 @@ namespace WixToolset.Core.WindowsInstaller
2607 { 2609 {
2608 foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable))) 2610 foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable)))
2609 { 2611 {
2612 var sequenceTableName = GetSequenceTableName(sequenceTable);
2613
2610 // if suppressing UI elements, skip UI-related sequence tables 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))
2612 { 2616 {
2613 continue; 2617 continue;
2614 } 2618 }
2615 2619
2616 var actionsTable = new Table(this.tableDefinitions["WixAction"]); 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)];
2618 2622
2619 if (null != table) 2623 if (null != table)
2620 { 2624 {
@@ -2813,6 +2817,17 @@ namespace WixToolset.Core.WindowsInstaller
2813 } 2817 }
2814 } 2818 }
2815 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
2816 /// <summary> 2831 /// <summary>
2817 /// Get the path to a file in the source image. 2832 /// Get the path to a file in the source image.
2818 /// </summary> 2833 /// </summary>