Better solution to the UI custom action "problem."

Add platform-specific fragments that are referenced by the compiler
extension. That makes it easier to customize: Just copy the dialog set
authoring and rename, like in v3.

1 files changed, 2 insertions, 38 deletions

diff --git a/src/ext/UI/wixext/UICompiler.cs b/src/ext/UI/wixext/UICompiler.cs
index 6fdb5bd9..8b527454 100644
--- a/src/ext/UI/wixext/UICompiler.cs
+++ b/src/ext/UI/wixext/UICompiler.cs
@@ -17,11 +17,6 @@ namespace WixToolset.UI
         public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/ui";
 
         /// <summary>
-        /// Flag to prevent custom action symbols duplication.
-        /// </summary>
-        private bool customActionsAdded = false;
-
-        /// <summary>
         /// Processes an element for the Compiler.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
@@ -91,40 +86,9 @@ namespace WixToolset.UI
             }
             else
             {
+                var platform = this.Context.Platform == Platform.ARM64 ? "A64" : this.Context.Platform.ToString();
                 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixUI, id);
-
-                if (!customActionsAdded)
-                {
-                    // Because these custom actions are "scheduled" via `DoAction` control events, we have to create the
-                    // custom action definitions here, so the `DoAction` references are static and the targets are
-                    // dynamically created to properly reflect the platform-specific DLL and avoid having duplicate ids
-                    // in the UI .wixlib.
-                    var platform = this.Context.Platform == Platform.ARM64 ? "A64" : this.Context.Platform.ToString();
-                    var source = $"WixUiCa_{platform}";
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, source);
-
-                    section.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixUIPrintEula"))
-                    {
-                        TargetType = CustomActionTargetType.Dll,
-                        Target = "PrintEula",
-                        SourceType = CustomActionSourceType.Binary,
-                        Source = source,
-                        IgnoreResult = true,
-                        ExecutionType = CustomActionExecutionType.Immediate,
-                    });
-
-                    section.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixUIValidatePath"))
-                    {
-                        TargetType = CustomActionTargetType.Dll,
-                        Target = "ValidatePath",
-                        SourceType = CustomActionSourceType.Binary,
-                        Source = source,
-                        IgnoreResult = true,
-                        ExecutionType = CustomActionExecutionType.Immediate,
-                    });
-
-                    customActionsAdded = true;
-                }
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixUI, $"{id}_{platform}");
 
                 if (installDirectory != null)
                 {