From 9d9bb59efb71068f978dce42c95b4f0a472bb31e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 25 Nov 2019 16:03:38 +1000 Subject: Finish renaming SequenceTable.AdvertiseExecuteSequence. --- .../Decompile/Decompiler.cs | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Decompile') 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 { foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable))) { + var sequenceTableName = GetSequenceTableName(sequenceTable); + // if suppressing UI elements, skip UI-related sequence tables - if (this.SuppressUI && ("AdminUISequence" == sequenceTable.ToString() || "InstallUISequence" == sequenceTable.ToString())) + if (this.SuppressUI && ("AdminUISequence" == sequenceTableName || "InstallUISequence" == sequenceTableName)) { continue; } var actionsTable = new Table(this.tableDefinitions["WixAction"]); - var table = tables[sequenceTable.ToString()]; + var table = tables[sequenceTableName]; if (null != table) { @@ -2607,14 +2609,16 @@ namespace WixToolset.Core.WindowsInstaller { foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable))) { + var sequenceTableName = GetSequenceTableName(sequenceTable); + // if suppressing UI elements, skip UI-related sequence tables - if (this.SuppressUI && ("AdminUISequence" == sequenceTable.ToString() || "InstallUISequence" == sequenceTable.ToString())) + if (this.SuppressUI && ("AdminUISequence" == sequenceTableName || "InstallUISequence" == sequenceTableName)) { continue; } var actionsTable = new Table(this.tableDefinitions["WixAction"]); - var table = tables[String.Concat("Module", sequenceTable.ToString())]; + var table = tables[String.Concat("Module", sequenceTableName)]; if (null != table) { @@ -2813,6 +2817,17 @@ namespace WixToolset.Core.WindowsInstaller } } + private static string GetSequenceTableName(SequenceTable sequenceTable) + { + switch (sequenceTable) + { + case SequenceTable.AdvertiseExecuteSequence: + return "AdvtExecuteSequence"; + default: + return sequenceTable.ToString(); + } + } + /// /// Get the path to a file in the source image. /// -- cgit v1.2.3-55-g6feb