Finish renaming SequenceTable.AdvertiseExecuteSequence.

4 files changed, 35 insertions, 20 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
index 0d6e15d5..23a5fcba 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
@@ -369,13 +369,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 set.Add("AdminUISequence/FileCost");
 
                 // AdvtExecuteSequence table
-                set.Add("AdvtExecuteSequence/CostFinalize");
-                set.Add("AdvtExecuteSequence/CostInitialize");
-                set.Add("AdvtExecuteSequence/InstallInitialize");
-                set.Add("AdvtExecuteSequence/InstallFinalize");
-                set.Add("AdvtExecuteSequence/InstallValidate");
-                set.Add("AdvtExecuteSequence/PublishFeatures");
-                set.Add("AdvtExecuteSequence/PublishProduct");
+                set.Add("AdvertiseExecuteSequence/CostFinalize");
+                set.Add("AdvertiseExecuteSequence/CostInitialize");
+                set.Add("AdvertiseExecuteSequence/InstallInitialize");
+                set.Add("AdvertiseExecuteSequence/InstallFinalize");
+                set.Add("AdvertiseExecuteSequence/InstallValidate");
+                set.Add("AdvertiseExecuteSequence/PublishFeatures");
+                set.Add("AdvertiseExecuteSequence/PublishProduct");
 
                 // InstallExecuteSequence table
                 set.Add("InstallExecuteSequence/CostFinalize");
@@ -418,7 +418,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         set.Add("InstallUISequence/RMCCPSearch");
                         break;
                     case TupleDefinitionType.Class:
-                        set.Add("AdvtExecuteSequence/RegisterClassInfo");
+                        set.Add("AdvertiseExecuteSequence/RegisterClassInfo");
                         set.Add("InstallExecuteSequence/RegisterClassInfo");
                         set.Add("InstallExecuteSequence/UnregisterClassInfo");
                         break;
@@ -439,7 +439,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         set.Add("InstallExecuteSequence/RemoveEnvironmentStrings");
                         break;
                     case TupleDefinitionType.Extension:
-                        set.Add("AdvtExecuteSequence/RegisterExtensionInfo");
+                        set.Add("AdvertiseExecuteSequence/RegisterExtensionInfo");
                         set.Add("InstallExecuteSequence/RegisterExtensionInfo");
                         set.Add("InstallExecuteSequence/UnregisterExtensionInfo");
                         break;
@@ -486,7 +486,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         set.Add("InstallUISequence/LaunchConditions");
                         break;
                     case TupleDefinitionType.MIME:
-                        set.Add("AdvtExecuteSequence/RegisterMIMEInfo");
+                        set.Add("AdvertiseExecuteSequence/RegisterMIMEInfo");
                         set.Add("InstallExecuteSequence/RegisterMIMEInfo");
                         set.Add("InstallExecuteSequence/UnregisterMIMEInfo");
                         break;
@@ -494,7 +494,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         set.Add("InstallExecuteSequence/MoveFiles");
                         break;
                     case TupleDefinitionType.Assembly:
-                        set.Add("AdvtExecuteSequence/MsiPublishAssemblies");
+                        set.Add("AdvertiseExecuteSequence/MsiPublishAssemblies");
                         set.Add("InstallExecuteSequence/MsiPublishAssemblies");
                         set.Add("InstallExecuteSequence/MsiUnpublishAssemblies");
                         break;
@@ -510,12 +510,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         set.Add("InstallExecuteSequence/RemoveODBC");
                         break;
                     case TupleDefinitionType.ProgId:
-                        set.Add("AdvtExecuteSequence/RegisterProgIdInfo");
+                        set.Add("AdvertiseExecuteSequence/RegisterProgIdInfo");
                         set.Add("InstallExecuteSequence/RegisterProgIdInfo");
                         set.Add("InstallExecuteSequence/UnregisterProgIdInfo");
                         break;
                     case TupleDefinitionType.PublishComponent:
-                        set.Add("AdvtExecuteSequence/PublishComponents");
+                        set.Add("AdvertiseExecuteSequence/PublishComponents");
                         set.Add("InstallExecuteSequence/PublishComponents");
                         set.Add("InstallExecuteSequence/UnpublishComponents");
                         break;
@@ -536,7 +536,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         set.Add("InstallExecuteSequence/InstallServices");
                         break;
                     case TupleDefinitionType.Shortcut:
-                        set.Add("AdvtExecuteSequence/CreateShortcuts");
+                        set.Add("AdvertiseExecuteSequence/CreateShortcuts");
                         set.Add("InstallExecuteSequence/CreateShortcuts");
                         set.Add("InstallExecuteSequence/RemoveShortcuts");
                         break;
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();
+            }
+        }
+
         /// <summary>
         /// Get the path to a file in the source image.
         /// </summary>
diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index 71ddef8f..5765cdfa 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -125,7 +125,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanDecompileSequenceTables()
         {
             var folder = TestData.Get(@"TestData\SequenceTables");
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 068ae2b7..5a78bbc2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -252,7 +252,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesCustomActionTable()
         {
             var folder = TestData.Get(@"TestData");