diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler_2.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_2.cs | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index 11063bd8..204a3788 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs | |||
| @@ -642,14 +642,6 @@ namespace WixToolset.Core | |||
| 642 | platform = "x64"; | 642 | platform = "x64"; |
| 643 | msiVersion = 200; | 643 | msiVersion = 200; |
| 644 | break; | 644 | break; |
| 645 | case Platform.IA64: | ||
| 646 | platform = "Intel64"; | ||
| 647 | msiVersion = 200; | ||
| 648 | break; | ||
| 649 | case Platform.ARM: | ||
| 650 | platform = "Arm"; | ||
| 651 | msiVersion = 500; | ||
| 652 | break; | ||
| 653 | case Platform.ARM64: | 645 | case Platform.ARM64: |
| 654 | platform = "Arm64"; | 646 | platform = "Arm64"; |
| 655 | msiVersion = 500; | 647 | msiVersion = 500; |
| @@ -766,15 +758,6 @@ namespace WixToolset.Core | |||
| 766 | case "x64": | 758 | case "x64": |
| 767 | platform = "x64"; | 759 | platform = "x64"; |
| 768 | break; | 760 | break; |
| 769 | case "intel64": | ||
| 770 | this.Core.Write(WarningMessages.DeprecatedAttributeValue(sourceLineNumbers, platformValue, node.Name.LocalName, attrib.Name.LocalName, "ia64")); | ||
| 771 | goto case "ia64"; | ||
| 772 | case "ia64": | ||
| 773 | platform = "Intel64"; | ||
| 774 | break; | ||
| 775 | case "arm": | ||
| 776 | platform = "Arm"; | ||
| 777 | break; | ||
| 778 | case "arm64": | 761 | case "arm64": |
| 779 | platform = "Arm64"; | 762 | platform = "Arm64"; |
| 780 | break; | 763 | break; |
| @@ -823,13 +806,13 @@ namespace WixToolset.Core | |||
| 823 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "InstallPrivileges", "InstallScope")); | 806 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "InstallPrivileges", "InstallScope")); |
| 824 | } | 807 | } |
| 825 | 808 | ||
| 826 | if ((String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) || String.Equals(platform, "Intel64", StringComparison.OrdinalIgnoreCase)) && 200 > msiVersion) | 809 | if (String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) && 200 > msiVersion) |
| 827 | { | 810 | { |
| 828 | msiVersion = 200; | 811 | msiVersion = 200; |
| 829 | this.Core.Write(WarningMessages.RequiresMsi200for64bitPackage(sourceLineNumbers)); | 812 | this.Core.Write(WarningMessages.RequiresMsi200for64bitPackage(sourceLineNumbers)); |
| 830 | } | 813 | } |
| 831 | 814 | ||
| 832 | if ((String.Equals(platform, "Arm", StringComparison.OrdinalIgnoreCase) || String.Equals(platform, "Arm64", StringComparison.OrdinalIgnoreCase)) && 500 > msiVersion) | 815 | if (String.Equals(platform, "Arm64", StringComparison.OrdinalIgnoreCase) && 500 > msiVersion) |
| 833 | { | 816 | { |
| 834 | msiVersion = 500; | 817 | msiVersion = 500; |
| 835 | this.Core.Write(WarningMessages.RequiresMsi500forArmPackage(sourceLineNumbers)); | 818 | this.Core.Write(WarningMessages.RequiresMsi500forArmPackage(sourceLineNumbers)); |
