Remove 32-bit ARM support.
Bob Arnson committed
Sep 19, 2020 at 21:20 UTC
27124207afa517da564cdce557dd21654f1a9078
8 files changed
+8
-61
src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+1
-1
@@ -80,7 +80,7 @@ namespace WixToolset.Core.Burn.Bundles
80
// "Elevated privileges are not required to install this package."
81
// in MSI 4.5 and below, if this bit is 0, elevation is required.
82
var perMachine = (0 == (sumInfo.WordCount & 8));
83
- var x64 = (sumInfo.Template.Contains("x64") || sumInfo.Template.Contains("Intel64"));
83
+ var x64 = sumInfo.Template.Contains("x64");
84
85
this.Facade.PackageSymbol.PerMachine = perMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No;
86
this.Facade.PackageSymbol.Win64 = x64;
src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
-6
@@ -154,15 +154,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
154
case "x64":
155
return Platform.X64;
156
157
- case "Arm":
158
- return Platform.ARM;
159
-
157
case "Arm64":
158
return Platform.ARM64;
159
163
- case "Intel64":
164
- return Platform.IA64;
165
-
160
case "Intel":
161
default:
162
return Platform.X86;
src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
-6
@@ -3011,15 +3011,9 @@ namespace WixToolset.Core.WindowsInstaller
3011
case "Intel":
3012
xPackage.SetAttributeValue("Platform", "x86");
3013
break;
3014
- case "Intel64":
3015
- xPackage.SetAttributeValue("Platform", "ia64");
3016
- break;
3014
case "x64":
3015
xPackage.SetAttributeValue("Platform", "x64");
3016
break;
3020
- case "Arm":
3021
- xPackage.SetAttributeValue("Platform", "arm");
3022
- break;
3017
case "Arm64":
3018
xPackage.SetAttributeValue("Platform", "arm64");
3019
break;
src/WixToolset.Core/Compiler.cs
+2
-8
@@ -82,7 +82,7 @@ namespace WixToolset.Core
82
/// Gets or sets the platform which the compiler will use when defaulting 64-bit attributes and elements.
83
/// </summary>
84
/// <value>The platform which the compiler will use when defaulting 64-bit attributes and elements.</value>
85
- public bool IsCurrentPlatform64Bit => this.Context.Platform == Platform.ARM64 || this.Context.Platform == Platform.IA64 || this.Context.Platform == Platform.X64;
85
+ public bool IsCurrentPlatform64Bit => this.Context.Platform == Platform.ARM64 || this.Context.Platform == Platform.X64;
86
87
/// <summary>
88
/// Gets or sets the option to show pedantic messages.
@@ -5639,19 +5639,13 @@ namespace WixToolset.Core
5639
case "x64":
5640
procArch = "amd64";
5641
break;
5642
- case "ia64":
5643
- procArch = "ia64";
5644
- break;
5645
- case "arm":
5646
- procArch = "arm";
5647
- break;
5642
case "arm64":
5643
procArch = "arm64";
5644
break;
5645
case "":
5646
break;
5647
default:
5654
- this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "File", "ProcessorArchitecture", procArchValue, "msil", "x86", "x64", "ia64"));
5648
+ this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, "File", "ProcessorArchitecture", procArchValue, "msil", "x86", "x64"));
5649
break;
5650
}
5651
break;
src/WixToolset.Core/Compiler_2.cs
+2
-19
@@ -642,14 +642,6 @@ namespace WixToolset.Core
642
platform = "x64";
643
msiVersion = 200;
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;
645
case Platform.ARM64:
646
platform = "Arm64";
647
msiVersion = 500;
@@ -766,15 +758,6 @@ namespace WixToolset.Core
758
case "x64":
759
platform = "x64";
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;
761
case "arm64":
762
platform = "Arm64";
763
break;
@@ -823,13 +806,13 @@ namespace WixToolset.Core
806
this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "InstallPrivileges", "InstallScope"));
807
}
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)
810
{
811
msiVersion = 200;
812
this.Core.Write(WarningMessages.RequiresMsi200for64bitPackage(sourceLineNumbers));
813
}
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)
816
{
817
msiVersion = 500;
818
this.Core.Write(WarningMessages.RequiresMsi500forArmPackage(sourceLineNumbers));
src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
-12
@@ -138,12 +138,6 @@ namespace WixToolset.Core.ExtensibilityServices
138
suffix = "_X64";
139
}
140
break;
141
- case Platform.ARM:
142
- if ((supportedPlatforms & BurnPlatforms.ARM) == BurnPlatforms.ARM)
143
- {
144
- suffix = "_A32";
145
- }
146
- break;
141
case Platform.ARM64:
142
if ((supportedPlatforms & BurnPlatforms.ARM64) == BurnPlatforms.ARM64)
143
{
@@ -907,12 +901,6 @@ namespace WixToolset.Core.ExtensibilityServices
901
suffix = "_X64";
902
}
903
break;
910
- case Platform.ARM:
911
- if ((supportedPlatforms & CustomActionPlatforms.ARM) == CustomActionPlatforms.ARM)
912
- {
913
- suffix = "_A32";
914
- }
915
- break;
904
case Platform.ARM64:
905
if ((supportedPlatforms & CustomActionPlatforms.ARM64) == CustomActionPlatforms.ARM64)
906
{
src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
-6
@@ -238,12 +238,6 @@ namespace WixToolset.Core.ExtensibilityServices
238
case Platform.X64:
239
return "x64";
240
241
- case Platform.IA64:
242
- return "ia64";
243
-
244
- case Platform.ARM:
245
- return "arm";
246
-
241
case Platform.ARM64:
242
return "arm64";
243
src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
+3
-3
@@ -19,10 +19,10 @@ namespace WixToolsetTest.CoreIntegration
19
var section = new IntermediateSection("section", SectionType.Fragment, 0);
20
var parseHelper = serviceProvider.GetService<IParseHelper>();
21
22
- parseHelper.CreateCustomActionReference(null, section, "CustomAction32", Platform.X86, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
23
- parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
22
+ parseHelper.CreateCustomActionReference(null, section, "CustomAction32", Platform.X86, CustomActionPlatforms.X86);
23
+ parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86);
24
parseHelper.CreateCustomActionReference(null, section, "CustomArmAction", Platform.ARM64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
25
- parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
25
+ parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86);
26
parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64);
27
28
var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>();