From df8cf532fb8f77947664b95901122b8b47fe562b Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 17 May 2020 17:30:46 -0400 Subject: Add missing ARM64 cases & random fixes. --- .../Unbind/ExtractCabinetsCommand.cs | 2 +- src/WixToolset.Core/Compiler.cs | 18 +++++++-- src/WixToolset.Core/Compiler_2.cs | 45 +++++++++++++--------- .../ExtensibilityServices/PreprocessHelper.cs | 3 ++ 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs index 6840b2d4..f63835b8 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs @@ -90,7 +90,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind { if (null != record) { - // since the cabinets are stored in case-sensitive streams inside the msi, but the file system is not case-sensitive, + // since the cabinets are stored in case-sensitive streams inside the msi, but the file system is not (typically) case-sensitive, // embedded cabinets must be extracted to a canonical file name (like their diskid) to ensure extraction will always work var cabinetFile = Path.Combine(this.IntermediateFolder, String.Concat("Media", Path.DirectorySeparatorChar, diskId.ToString(CultureInfo.InvariantCulture), ".cab")); diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index d4ad3279..32e9b9d6 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -78,6 +78,12 @@ namespace WixToolset.Core /// The platform which the compiler will use when defaulting 64-bit attributes and elements. public Platform CurrentPlatform => this.Context.Platform; + /// + /// 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; + /// /// Gets or sets the option to show pedantic messages. /// @@ -1777,7 +1783,7 @@ namespace WixToolset.Core } } - if (!explicitWin64 && (Platform.IA64 == this.CurrentPlatform || Platform.X64 == this.CurrentPlatform)) + if (!explicitWin64 && this.IsCurrentPlatform64Bit) { search64bit = true; } @@ -2250,7 +2256,7 @@ namespace WixToolset.Core } } - if (!explicitWin64 && (Platform.IA64 == this.CurrentPlatform || Platform.X64 == this.CurrentPlatform)) + if (!explicitWin64 && this.IsCurrentPlatform64Bit) { //bits |= MsiInterop.MsidbComponentAttributes64bit; win64 = true; @@ -3405,7 +3411,7 @@ namespace WixToolset.Core id = Identifier.Invalid; } - if (!explicitWin64 && (CustomActionTargetType.VBScript == targetType || CustomActionTargetType.JScript == targetType) && (Platform.IA64 == this.CurrentPlatform || Platform.X64 == this.CurrentPlatform)) + if (!explicitWin64 && this.IsCurrentPlatform64Bit && (CustomActionTargetType.VBScript == targetType || CustomActionTargetType.JScript == targetType)) { win64 = true; } @@ -5510,6 +5516,12 @@ namespace WixToolset.Core case "ia64": procArch = "ia64"; break; + case "arm": + procArch = "arm"; + break; + case "arm64": + procArch = "arm64"; + break; case "": break; default: diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index 85fb9e4c..c5f3fb6f 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs @@ -632,23 +632,27 @@ namespace WixToolset.Core switch (this.CurrentPlatform) { - case Platform.X86: - platform = "Intel"; - break; - case Platform.X64: - platform = "x64"; - msiVersion = 200; - break; - case Platform.IA64: - platform = "Intel64"; - msiVersion = 200; - break; - case Platform.ARM: - platform = "Arm"; - msiVersion = 500; - break; - default: - throw new ArgumentException("Unknown platform enumeration '{0}' encountered.", this.CurrentPlatform.ToString()); + case Platform.X86: + platform = "Intel"; + break; + case Platform.X64: + 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; + break; + default: + throw new ArgumentException("Unknown platform enumeration '{0}' encountered.", this.CurrentPlatform.ToString()); } foreach (var attrib in node.Attributes()) @@ -768,6 +772,9 @@ namespace WixToolset.Core case "arm": platform = "Arm"; break; + case "arm64": + platform = "Arm64"; + break; case "": break; default: @@ -813,13 +820,13 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "InstallPrivileges", "InstallScope")); } - if ((0 != String.Compare(platform, "Intel", StringComparison.OrdinalIgnoreCase)) && 200 > msiVersion) + if ((String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) || String.Equals(platform, "Intel64", StringComparison.OrdinalIgnoreCase)) && 200 > msiVersion) { msiVersion = 200; this.Core.Write(WarningMessages.RequiresMsi200for64bitPackage(sourceLineNumbers)); } - if ((0 == String.Compare(platform, "Arm", StringComparison.OrdinalIgnoreCase)) && 500 > msiVersion) + if ((String.Equals(platform, "Arm", StringComparison.OrdinalIgnoreCase) || String.Equals(platform, "Arm64", StringComparison.OrdinalIgnoreCase)) && 500 > msiVersion) { msiVersion = 500; this.Core.Write(WarningMessages.RequiresMsi500forArmPackage(sourceLineNumbers)); diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs index bdf11879..e84bb001 100644 --- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs @@ -244,6 +244,9 @@ namespace WixToolset.Core.ExtensibilityServices case Platform.ARM: return "arm"; + case Platform.ARM64: + return "arm64"; + default: throw new ArgumentException("Unknown platform enumeration '{0}' encountered.", context.Platform.ToString()); } -- cgit v1.2.3-55-g6feb