diff options
Diffstat (limited to 'src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs')
-rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 14 |
1 files changed, 5 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 | |||
897 | if (!this.Messaging.EncounteredError) | 897 | if (!this.Messaging.EncounteredError) |
898 | { | 898 | { |
899 | var name = String.Concat("Wix4", customAction); | 899 | var name = String.Concat("Wix4", customAction); |
900 | var suffix = "_X86"; | ||
900 | 901 | ||
901 | switch (currentPlatform) | 902 | switch (currentPlatform) |
902 | { | 903 | { |
903 | case Platform.X64: | 904 | case Platform.X64: |
904 | if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64) | 905 | if ((supportedPlatforms & CustomActionPlatforms.X64) == CustomActionPlatforms.X64) |
905 | { | 906 | { |
906 | name = String.Concat(name, "_X64"); | 907 | suffix = "_X64"; |
907 | } | 908 | } |
908 | break; | 909 | break; |
909 | case Platform.ARM: | 910 | case Platform.ARM: |
910 | if ((supportedPlatforms & CustomActionPlatforms.ARM) == CustomActionPlatforms.ARM) | 911 | if ((supportedPlatforms & CustomActionPlatforms.ARM) == CustomActionPlatforms.ARM) |
911 | { | 912 | { |
912 | name = String.Concat(name, "_A32"); | 913 | suffix = "_A32"; |
913 | } | 914 | } |
914 | break; | 915 | break; |
915 | case Platform.ARM64: | 916 | case Platform.ARM64: |
916 | if ((supportedPlatforms & CustomActionPlatforms.ARM64) == CustomActionPlatforms.ARM64) | 917 | if ((supportedPlatforms & CustomActionPlatforms.ARM64) == CustomActionPlatforms.ARM64) |
917 | { | 918 | { |
918 | name = String.Concat(name, "_A64"); | 919 | suffix = "_A64"; |
919 | } | 920 | } |
920 | break; | 921 | break; |
921 | // Fall back to x86. | ||
922 | case Platform.X86: | ||
923 | default: | ||
924 | name = String.Concat(name, "_X86"); | ||
925 | break; | ||
926 | } | 922 | } |
927 | 923 | ||
928 | this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), name); | 924 | this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), name + suffix); |
929 | } | 925 | } |
930 | } | 926 | } |
931 | 927 | ||