Remove 32-bit ARM support.
Bob Arnson committed
Sep 19, 2020 at 21:15 UTC
ff976bcda3a0fb9632e353800025a7d87f31ee16
4 files changed
+5
-16
src/WixToolset.Data/ErrorMessages.cs
+1
-6
@@ -1324,14 +1324,9 @@ namespace WixToolset.Data
1324
return Message(sourceLineNumbers, Ids.InvalidModuleOrBundleVersion, "Invalid {0}/@Version '{1}'. {0} version has a max value of \"65535.65535.65535.65535\" and must be all numeric.", moduleOrBundle, version);
1325
}
1326
1327
- public static Message InvalidPlatformParameter(string name, string value)
1328
- {
1329
- return Message(null, Ids.InvalidPlatformParameter, "The parameter '{0}' is missing or has an invalid value {1}. Possible values are x86, x64, or ia64.", name, value);
1330
- }
1331
-
1327
public static Message InvalidPlatformValue(SourceLineNumber sourceLineNumbers, string value)
1328
{
1334
- return Message(sourceLineNumbers, Ids.InvalidPlatformValue, "The Platform attribute has an invalid value {0}. Possible values are x86, x64, or ia64.", value);
1329
+ return Message(sourceLineNumbers, Ids.InvalidPlatformValue, "The Platform attribute has an invalid value {0}. Possible values are x86, x64, or arm64.", value);
1330
}
1331
1332
public static Message InvalidPreprocessorFunction(SourceLineNumber sourceLineNumbers, string variable)
src/WixToolset.Data/Platform.cs
-6
@@ -13,12 +13,6 @@ namespace WixToolset.Data
13
/// <summary>x64.</summary>
14
X64,
15
16
- /// <summary>ia64.</summary>
17
- IA64,
18
-
19
- /// <summary>arm.</summary>
20
- ARM,
21
-
16
/// <summary>arm64.</summary>
17
ARM64,
18
}
src/WixToolset.Data/WarningMessages.cs
+1
-1
@@ -504,7 +504,7 @@ namespace WixToolset.Data
504
505
public static Message RequiresMsi500forArmPackage(SourceLineNumber sourceLineNumbers)
506
{
507
- return Message(sourceLineNumbers, Ids.RequiresMsi500forArmPackage, "Package/@InstallerVersion must be 500 or greater for an ARM or ARM64 package. The value will be changed to 500. Please specify a value of 500 or greater in order to eliminate this warning.");
507
+ return Message(sourceLineNumbers, Ids.RequiresMsi500forArmPackage, "Package/@InstallerVersion must be 500 or greater for an ARM64 package. The value will be changed to 500. Please specify a value of 500 or greater in order to eliminate this warning.");
508
}
509
510
public static Message ReservedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
+3
-3
@@ -433,13 +433,13 @@ namespace WixToolset.Data.WindowsInstaller
433
switch (directoryId)
434
{
435
case "CommonFiles6432Folder":
436
- return platform == Platform.X86 || platform == Platform.ARM ? "CommonFilesFolder" : "CommonFiles64Folder";
436
+ return platform == Platform.X86 ? "CommonFilesFolder" : "CommonFiles64Folder";
437
438
case "ProgramFiles6432Folder":
439
- return platform == Platform.X86 || platform == Platform.ARM ? "ProgramFilesFolder" : "ProgramFiles64Folder";
439
+ return platform == Platform.X86 ? "ProgramFilesFolder" : "ProgramFiles64Folder";
440
441
case "System6432Folder":
442
- return platform == Platform.X86 || platform == Platform.ARM ? "SystemFolder" : "System64Folder";
442
+ return platform == Platform.X86 ? "SystemFolder" : "System64Folder";
443
444
default:
445
return directoryId;