diff options
author | Bob Arnson <bob@firegiant.com> | 2020-03-05 15:26:52 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-03-05 15:31:32 -0500 |
commit | 6c4f0767ee16e95e0f3f735586caaa07d356245d (patch) | |
tree | 1696dfce186141e7ae806122d2dd8cbb528a6e95 /src | |
parent | a062d5f5befac64b3aaa3b277fd4501c640551bb (diff) | |
download | wix-6c4f0767ee16e95e0f3f735586caaa07d356245d.tar.gz wix-6c4f0767ee16e95e0f3f735586caaa07d356245d.tar.bz2 wix-6c4f0767ee16e95e0f3f735586caaa07d356245d.zip |
Default custom action platform to x86.
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 12 |
1 files changed, 4 insertions, 8 deletions
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 | |||
900 | 900 | ||
901 | switch (currentPlatform) | 901 | switch (currentPlatform) |
902 | { | 902 | { |
903 | case Platform.X86: | ||
904 | if ((supportedPlatforms & CustomActionPlatforms.X86) == CustomActionPlatforms.X86) | ||
905 | { | ||
906 | name = String.Concat(name, "_X86"); | ||
907 | } | ||
908 | break; | ||
909 | case Platform.X64: | 903 | case Platform.X64: |
910 | if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64) | 904 | if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64) |
911 | { | 905 | { |
@@ -924,8 +918,10 @@ namespace WixToolset.Core.ExtensibilityServices | |||
924 | name = String.Concat(name, "_A64"); | 918 | name = String.Concat(name, "_A64"); |
925 | } | 919 | } |
926 | break; | 920 | break; |
927 | case Platform.IA64: | 921 | // Fall back to x86. |
928 | // yeah, no | 922 | case Platform.X86: |
923 | default: | ||
924 | name = String.Concat(name, "_X86"); | ||
929 | break; | 925 | break; |
930 | } | 926 | } |
931 | 927 | ||