From ff976bcda3a0fb9632e353800025a7d87f31ee16 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sat, 19 Sep 2020 21:15:28 -0400
Subject: Remove 32-bit ARM support.

---
 src/WixToolset.Data/ErrorMessages.cs                             | 7 +------
 src/WixToolset.Data/Platform.cs                                  | 6 ------
 src/WixToolset.Data/WarningMessages.cs                           | 2 +-
 src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs | 6 +++---
 4 files changed, 5 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs
index e36cc55c..32757deb 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -1324,14 +1324,9 @@ namespace WixToolset.Data
             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);
         }
 
-        public static Message InvalidPlatformParameter(string name, string value)
-        {
-            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);
-        }
-
         public static Message InvalidPlatformValue(SourceLineNumber sourceLineNumbers, string value)
         {
-            return Message(sourceLineNumbers, Ids.InvalidPlatformValue, "The Platform attribute has an invalid value {0}.  Possible values are x86, x64, or ia64.", value);
+            return Message(sourceLineNumbers, Ids.InvalidPlatformValue, "The Platform attribute has an invalid value {0}.  Possible values are x86, x64, or arm64.", value);
         }
 
         public static Message InvalidPreprocessorFunction(SourceLineNumber sourceLineNumbers, string variable)
diff --git a/src/WixToolset.Data/Platform.cs b/src/WixToolset.Data/Platform.cs
index 193a0e05..f939ac55 100644
--- a/src/WixToolset.Data/Platform.cs
+++ b/src/WixToolset.Data/Platform.cs
@@ -13,12 +13,6 @@ namespace WixToolset.Data
         /// <summary>x64.</summary>
         X64,
 
-        /// <summary>ia64.</summary>
-        IA64,
-
-        /// <summary>arm.</summary>
-        ARM,
-
         /// <summary>arm64.</summary>
         ARM64,
     }
diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs
index 258b61f7..438dc8f3 100644
--- a/src/WixToolset.Data/WarningMessages.cs
+++ b/src/WixToolset.Data/WarningMessages.cs
@@ -504,7 +504,7 @@ namespace WixToolset.Data
 
         public static Message RequiresMsi500forArmPackage(SourceLineNumber sourceLineNumbers)
         {
-            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.");
+            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.");
         }
 
         public static Message ReservedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
index 74790915..7d539af1 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
@@ -433,13 +433,13 @@ namespace WixToolset.Data.WindowsInstaller
             switch (directoryId)
             {
                 case "CommonFiles6432Folder":
-                    return platform == Platform.X86 || platform == Platform.ARM ? "CommonFilesFolder" : "CommonFiles64Folder";
+                    return platform == Platform.X86 ? "CommonFilesFolder" : "CommonFiles64Folder";
 
                 case "ProgramFiles6432Folder":
-                    return platform == Platform.X86 || platform == Platform.ARM ? "ProgramFilesFolder" : "ProgramFiles64Folder";
+                    return platform == Platform.X86 ? "ProgramFilesFolder" : "ProgramFiles64Folder";
 
                 case "System6432Folder":
-                    return platform == Platform.X86 || platform == Platform.ARM ? "SystemFolder" : "System64Folder";
+                    return platform == Platform.X86 ? "SystemFolder" : "System64Folder";
 
                 default:
                     return directoryId;
-- 
cgit v1.2.3-55-g6feb