From 27124207afa517da564cdce557dd21654f1a9078 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sat, 19 Sep 2020 21:20:31 -0400 Subject: Remove 32-bit ARM support. --- src/WixToolset.Core/Compiler_2.cs | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'src/WixToolset.Core/Compiler_2.cs') 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 platform = "x64"; msiVersion = 200; break; - case Platform.IA64: - platform = "Intel64"; - msiVersion = 200; - break; - case Platform.ARM: - platform = "Arm"; - msiVersion = 500; - break; case Platform.ARM64: platform = "Arm64"; msiVersion = 500; @@ -766,15 +758,6 @@ namespace WixToolset.Core case "x64": platform = "x64"; break; - case "intel64": - this.Core.Write(WarningMessages.DeprecatedAttributeValue(sourceLineNumbers, platformValue, node.Name.LocalName, attrib.Name.LocalName, "ia64")); - goto case "ia64"; - case "ia64": - platform = "Intel64"; - break; - case "arm": - platform = "Arm"; - break; case "arm64": platform = "Arm64"; break; @@ -823,13 +806,13 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "InstallPrivileges", "InstallScope")); } - if ((String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) || String.Equals(platform, "Intel64", StringComparison.OrdinalIgnoreCase)) && 200 > msiVersion) + if (String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) && 200 > msiVersion) { msiVersion = 200; this.Core.Write(WarningMessages.RequiresMsi200for64bitPackage(sourceLineNumbers)); } - if ((String.Equals(platform, "Arm", StringComparison.OrdinalIgnoreCase) || String.Equals(platform, "Arm64", StringComparison.OrdinalIgnoreCase)) && 500 > msiVersion) + if (String.Equals(platform, "Arm64", StringComparison.OrdinalIgnoreCase) && 500 > msiVersion) { msiVersion = 500; this.Core.Write(WarningMessages.RequiresMsi500forArmPackage(sourceLineNumbers)); -- cgit v1.2.3-55-g6feb