From fcaaa4eb7ee6581693faefc553b63fdb02ca30bc Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 9 Aug 2022 08:50:48 -0700 Subject: Fix architectures when generating metadata --- src/setup/MetadataTask/GenerateMetadata.cs | 4 ++-- src/setup/MetadataTask/Metadata.cs | 20 -------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs index 4071c271..a5b45102 100644 --- a/src/setup/MetadataTask/GenerateMetadata.cs +++ b/src/setup/MetadataTask/GenerateMetadata.cs @@ -104,8 +104,8 @@ namespace WixToolset.Tasks switch (platform) { case Platform.X86: return ArchitectureType.X86; - case Platform.X64: return ArchitectureType.X86; - case Platform.ARM64: return ArchitectureType.X86; + case Platform.X64: return ArchitectureType.X64; + case Platform.ARM64: return ArchitectureType.Arm64; default: throw new ArgumentException($"Unknown platform {platform}"); } } diff --git a/src/setup/MetadataTask/Metadata.cs b/src/setup/MetadataTask/Metadata.cs index 139d9240..041e25ad 100644 --- a/src/setup/MetadataTask/Metadata.cs +++ b/src/setup/MetadataTask/Metadata.cs @@ -17,26 +17,6 @@ namespace WixToolset.Tasks X86, } - //{ - // "id": [PackageSymbolId] | [BundleSymbolId], - // "type": "msi" | "burn" - // "name": [ProductName] | [BundleName] - // "locale": [ProductLanguage] | [BundleLanguage] - // "publisher": [Manufacturer] - // "aboutUrl": [ARPURLINFOABOUT] | [AboutUrl] - // "supportUrl": [ARPHELPLINK] | [SupportUrl] - // "description": [ARPCOMMENTS] | "Installation for" + [BundleName] - // "license": [ProductLicense] | [BundleLicense] - // "architecture": "x86" | "x64" | "arm64" - // "size": #### - // "sha256": hex, - // "file": - // "created": - // "productCode": [ProductCode] - // "bundleCode": [BundleId] - // "upgradeCode": [UpgradeCode] - //} - public class Metadata { public string Id { get; set; } -- cgit v1.2.3-55-g6feb