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. --- .../Bundles/ProcessMsiPackageCommand.cs | 2 +- .../Bind/BindSummaryInfoCommand.cs | 6 ------ .../Decompile/Decompiler.cs | 6 ------ src/WixToolset.Core/Compiler.cs | 10 ++-------- src/WixToolset.Core/Compiler_2.cs | 21 ++------------------- .../ExtensibilityServices/ParseHelper.cs | 12 ------------ .../ExtensibilityServices/PreprocessHelper.cs | 6 ------ .../WixToolsetTest.CoreIntegration/ParseFixture.cs | 6 +++--- 8 files changed, 8 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs index 3eb97ee6..7adbfcfd 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs @@ -80,7 +80,7 @@ namespace WixToolset.Core.Burn.Bundles // "Elevated privileges are not required to install this package." // in MSI 4.5 and below, if this bit is 0, elevation is required. var perMachine = (0 == (sumInfo.WordCount & 8)); - var x64 = (sumInfo.Template.Contains("x64") || sumInfo.Template.Contains("Intel64")); + var x64 = sumInfo.Template.Contains("x64"); this.Facade.PackageSymbol.PerMachine = perMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No; this.Facade.PackageSymbol.Win64 = x64; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs index 63691016..6af2dc7a 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs @@ -154,15 +154,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind case "x64": return Platform.X64; - case "Arm": - return Platform.ARM; - case "Arm64": return Platform.ARM64; - case "Intel64": - return Platform.IA64; - case "Intel": default: return Platform.X86; diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index e471d924..40643abd 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -3011,15 +3011,9 @@ namespace WixToolset.Core.WindowsInstaller case "Intel": xPackage.SetAttributeValue("Platform", "x86"); break; - case "Intel64": - xPackage.SetAttributeValue("Platform", "ia64"); - break; case "x64": xPackage.SetAttributeValue("Platform", "x64"); break; - case "Arm": - xPackage.SetAttributeValue("Platform", "arm"); - break; case "Arm64": xPackage.SetAttributeValue("Platform", "arm64"); break; diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 7be581bc..286a598b 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -82,7 +82,7 @@ namespace WixToolset.Core /// Gets or sets the platform which the compiler will use when defaulting 64-bit attributes and elements. /// /// The platform which the compiler will use when defaulting 64-bit attributes and elements. - public bool IsCurrentPlatform64Bit => this.Context.Platform == Platform.ARM64 || this.Context.Platform == Platform.IA64 || this.Context.Platform == Platform.X64; + public bool IsCurrentPlatform64Bit => this.Context.Platform == Platform.ARM64 || this.Context.Platform == Platform.X64; /// /// Gets or sets the option to show pedantic messages. @@ -5639,19 +5639,13 @@ namespace WixToolset.Core case "x64": procArch = "amd64"; break; - case "ia64": - procArch = "ia64"; - break; - case "arm": - procArch = "arm"; - break; case "arm64": procArch = "arm64"; break; case "": break; default: - this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "File", "ProcessorArchitecture", procArchValue, "msil", "x86", "x64", "ia64")); + this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "File", "ProcessorArchitecture", procArchValue, "msil", "x86", "x64")); break; } break; 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)); diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index e75f5fe5..7f718ad4 100644 --- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs @@ -138,12 +138,6 @@ namespace WixToolset.Core.ExtensibilityServices suffix = "_X64"; } break; - case Platform.ARM: - if ((supportedPlatforms & BurnPlatforms.ARM) == BurnPlatforms.ARM) - { - suffix = "_A32"; - } - break; case Platform.ARM64: if ((supportedPlatforms & BurnPlatforms.ARM64) == BurnPlatforms.ARM64) { @@ -907,12 +901,6 @@ namespace WixToolset.Core.ExtensibilityServices suffix = "_X64"; } break; - case Platform.ARM: - if ((supportedPlatforms & CustomActionPlatforms.ARM) == CustomActionPlatforms.ARM) - { - suffix = "_A32"; - } - break; case Platform.ARM64: if ((supportedPlatforms & CustomActionPlatforms.ARM64) == CustomActionPlatforms.ARM64) { diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs index e84bb001..df301196 100644 --- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs @@ -238,12 +238,6 @@ namespace WixToolset.Core.ExtensibilityServices case Platform.X64: return "x64"; - case Platform.IA64: - return "ia64"; - - case Platform.ARM: - return "arm"; - case Platform.ARM64: return "arm64"; diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs index 83f74a47..387031b9 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs @@ -19,10 +19,10 @@ namespace WixToolsetTest.CoreIntegration var section = new IntermediateSection("section", SectionType.Fragment, 0); var parseHelper = serviceProvider.GetService(); - parseHelper.CreateCustomActionReference(null, section, "CustomAction32", Platform.X86, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM); - parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM); + parseHelper.CreateCustomActionReference(null, section, "CustomAction32", Platform.X86, CustomActionPlatforms.X86); + parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86); parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); - parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM); + parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86); parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); var simpleReferences = section.Symbols.OfType(); -- cgit v1.2.3-55-g6feb