diff options
author | Rob Mensching <rob@firegiant.com> | 2022-08-09 08:50:48 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-08-15 06:49:36 -0700 |
commit | fcaaa4eb7ee6581693faefc553b63fdb02ca30bc (patch) | |
tree | 3b73f19aa583e27904ea1c05676905be879acd79 /src/setup | |
parent | ad82e17f5a0d0834a8e6bd8d49a87b14855ed6a8 (diff) | |
download | wix-fcaaa4eb7ee6581693faefc553b63fdb02ca30bc.tar.gz wix-fcaaa4eb7ee6581693faefc553b63fdb02ca30bc.tar.bz2 wix-fcaaa4eb7ee6581693faefc553b63fdb02ca30bc.zip |
Fix architectures when generating metadata
Diffstat (limited to 'src/setup')
-rw-r--r-- | src/setup/MetadataTask/GenerateMetadata.cs | 4 | ||||
-rw-r--r-- | 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 | |||
104 | switch (platform) | 104 | switch (platform) |
105 | { | 105 | { |
106 | case Platform.X86: return ArchitectureType.X86; | 106 | case Platform.X86: return ArchitectureType.X86; |
107 | case Platform.X64: return ArchitectureType.X86; | 107 | case Platform.X64: return ArchitectureType.X64; |
108 | case Platform.ARM64: return ArchitectureType.X86; | 108 | case Platform.ARM64: return ArchitectureType.Arm64; |
109 | default: throw new ArgumentException($"Unknown platform {platform}"); | 109 | default: throw new ArgumentException($"Unknown platform {platform}"); |
110 | } | 110 | } |
111 | } | 111 | } |
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 | |||
17 | X86, | 17 | X86, |
18 | } | 18 | } |
19 | 19 | ||
20 | //{ | ||
21 | // "id": [PackageSymbolId] | [BundleSymbolId], | ||
22 | // "type": "msi" | "burn" | ||
23 | // "name": [ProductName] | [BundleName] | ||
24 | // "locale": [ProductLanguage] | [BundleLanguage] | ||
25 | // "publisher": [Manufacturer] | ||
26 | // "aboutUrl": [ARPURLINFOABOUT] | [AboutUrl] | ||
27 | // "supportUrl": [ARPHELPLINK] | [SupportUrl] | ||
28 | // "description": [ARPCOMMENTS] | "Installation for" + [BundleName] | ||
29 | // "license": [ProductLicense] | [BundleLicense] | ||
30 | // "architecture": "x86" | "x64" | "arm64" | ||
31 | // "size": #### | ||
32 | // "sha256": hex, | ||
33 | // "file": <filename> | ||
34 | // "created": <ISO timestamp> | ||
35 | // "productCode": [ProductCode] | ||
36 | // "bundleCode": [BundleId] | ||
37 | // "upgradeCode": [UpgradeCode] | ||
38 | //} | ||
39 | |||
40 | public class Metadata | 20 | public class Metadata |
41 | { | 21 | { |
42 | public string Id { get; set; } | 22 | public string Id { get; set; } |