From 6a44e7d41c8b87e95f195f732402fb928c7079c1 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 27 Feb 2020 13:39:49 -0500 Subject: Detect MSIL for assembly name harvesting. --- src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/WixToolset.Core.WindowsInstaller') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs index 4815cb35..f3223f94 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 var name = ReadString(reader, assembly.Name); var culture = ReadString(reader, assembly.Culture); - var architecture = headers.PEHeader.Magic == PEMagic.PE32Plus ? "x64" : (headers.CorHeader.Flags & CorFlags.Requires32Bit) == CorFlags.Requires32Bit ? "x86" : null; + 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; var version = assembly.Version.ToString(); var publicKeyToken = ReadPublicKeyToken(reader, assembly.PublicKey); -- cgit v1.2.3-55-g6feb