Correctly handle custom action default suffix.

2 files changed, 41 insertions, 9 deletions

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);
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
new file mode 100644
index 00000000..eca3aa34
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.CoreIntegration
+{
+    using System.Linq;
+    using WixToolset.Core;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
+    using Xunit;
+
+    public class ParseFixture
+    {
+        [Fact]
+        public void GeneratesCorrectCustomActionIdentifiers()
+        {
+            var serviceProvider = new WixToolsetServiceProvider();
+            var section = new IntermediateSection("section", SectionType.Fragment, 0);
+            var parseHelper = serviceProvider.GetService<IParseHelper>();
+
+            parseHelper.CreateCustomActionReference(null, section, "CustomAction32", Platform.X86, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
+            parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
+            parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
+            parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
+            parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64);
+
+            var simpleReferences = section.Tuples.OfType<WixSimpleReferenceTuple>();
+            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault());
+            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault());
+            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault());
+            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction_X86").FirstOrDefault());
+            Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction_X64").FirstOrDefault());
+        }
+    }
+}