@joebigelow / wix-1 / commits / 6c4f0767

Default custom action platform to x86.

Bob Arnson committed Mar 5, 2020 at 15:26 UTC 6c4f0767ee16e95e0f3f735586caaa07d356245d
1 file changed +4 -8
src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+4 -8
@@ -900,12 +900,6 @@ namespace WixToolset.Core.ExtensibilityServices
900
901 switch (currentPlatform)
902 {
903 - case Platform.X86:
904 - if ((supportedPlatforms & CustomActionPlatforms.X86) == CustomActionPlatforms.X86)
905 - {
906 - name = String.Concat(name, "_X86");
907 - }
908 - break;
903 case Platform.X64:
904 if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64)
905 {
@@ -924,8 +918,10 @@ namespace WixToolset.Core.ExtensibilityServices
918 name = String.Concat(name, "_A64");
919 }
920 break;
927 - case Platform.IA64:
928 - // yeah, no
921 + // Fall back to x86.
922 + case Platform.X86:
923 + default:
924 + name = String.Concat(name, "_X86");
925 break;
926 }
927