From 72b6f0109008103dfe974fa4d2d3ce42e7b6b53e Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 5 Mar 2020 16:47:31 -0500
Subject: Correctly handle custom action default suffix.

---
 src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs')

diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index e16f909a..7447d420 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -897,35 +897,31 @@ namespace WixToolset.Core.ExtensibilityServices
             if (!this.Messaging.EncounteredError)
             {
                 var name = String.Concat("Wix4", customAction);
+                var suffix = "_X86";
 
                 switch (currentPlatform)
                 {
                     case Platform.X64:
                         if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64)
                         {
-                            name = String.Concat(name, "_X64");
+                            suffix = "_X64";
                         }
                         break;
                     case Platform.ARM:
                         if ((supportedPlatforms & CustomActionPlatforms.ARM) == CustomActionPlatforms.ARM)
                         {
-                            name = String.Concat(name, "_A32");
+                            suffix = "_A32";
                         }
                         break;
                     case Platform.ARM64:
                         if ((supportedPlatforms & CustomActionPlatforms.ARM64) == CustomActionPlatforms.ARM64)
                         {
-                            name = String.Concat(name, "_A64");
+                            suffix = "_A64";
                         }
                         break;
-                    // Fall back to x86.
-                    case Platform.X86:
-                    default:
-                        name = String.Concat(name, "_X86");
-                        break;
                 }
 
-                this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), name);
+                this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), name + suffix);
             }
         }
 
-- 
cgit v1.2.3-55-g6feb