From 6c4f0767ee16e95e0f3f735586caaa07d356245d Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 5 Mar 2020 15:26:52 -0500 Subject: Default custom action platform to x86. --- src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index 0d1c3ea8..e16f909a 100644 --- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs @@ -900,12 +900,6 @@ namespace WixToolset.Core.ExtensibilityServices switch (currentPlatform) { - case Platform.X86: - if ((supportedPlatforms & CustomActionPlatforms.X86) == CustomActionPlatforms.X86) - { - name = String.Concat(name, "_X86"); - } - break; case Platform.X64: if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64) { @@ -924,8 +918,10 @@ namespace WixToolset.Core.ExtensibilityServices name = String.Concat(name, "_A64"); } break; - case Platform.IA64: - // yeah, no + // Fall back to x86. + case Platform.X86: + default: + name = String.Concat(name, "_X86"); break; } -- cgit v1.2.3-55-g6feb