aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-02-27 22:06:22 -0500
committerBob Arnson <bob@firegiant.com>2020-02-27 22:06:22 -0500
commitdf3a0875e67d5c758d1c9ef5fee1f0fcc89c4611 (patch)
treee2df6d2ddd62b6ec529855fe162bc39f34d4592e
parent6a44e7d41c8b87e95f195f732402fb928c7079c1 (diff)
downloadwix-df3a0875e67d5c758d1c9ef5fee1f0fcc89c4611.tar.gz
wix-df3a0875e67d5c758d1c9ef5fee1f0fcc89c4611.tar.bz2
wix-df3a0875e67d5c758d1c9ef5fee1f0fcc89c4611.zip
Fix AMD64 assembly processorArchitecture.
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
index f3223f94..2f38fc68 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
@@ -29,7 +29,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
29 29
30 var name = ReadString(reader, assembly.Name); 30 var name = ReadString(reader, assembly.Name);
31 var culture = ReadString(reader, assembly.Culture); 31 var culture = ReadString(reader, assembly.Culture);
32 var architecture = headers.PEHeader.Magic == PEMagic.PE32Plus ? "x64" : (headers.CorHeader.Flags & CorFlags.Requires32Bit) == CorFlags.Requires32Bit ? "x86" : (headers.CorHeader.Flags & CorFlags.ILOnly) == CorFlags.ILOnly ? "MSIL" : null; 32 var architecture = headers.PEHeader.Magic == PEMagic.PE32Plus ? "AMD64" : (headers.CorHeader.Flags & CorFlags.Requires32Bit) == CorFlags.Requires32Bit ? "x86" : (headers.CorHeader.Flags & CorFlags.ILOnly) == CorFlags.ILOnly ? "MSIL" : null;
33 var version = assembly.Version.ToString(); 33 var version = assembly.Version.ToString();
34 var publicKeyToken = ReadPublicKeyToken(reader, assembly.PublicKey); 34 var publicKeyToken = ReadPublicKeyToken(reader, assembly.PublicKey);
35 35