Detect MSIL for assembly name harvesting.
Bob Arnson committed
Feb 27, 2020 at 13:39 UTC
6a44e7d41c8b87e95f195f732402fb928c7079c1
2 files changed
+2
-2
src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
+1
-1
@@ -29,7 +29,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
29
30
var name = ReadString(reader, assembly.Name);
31
var culture = ReadString(reader, assembly.Culture);
32
- var architecture = headers.PEHeader.Magic == PEMagic.PE32Plus ? "x64" : (headers.CorHeader.Flags & CorFlags.Requires32Bit) == CorFlags.Requires32Bit ? "x86" : null;
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;
33
var version = assembly.Version.ToString();
34
var publicKeyToken = ReadPublicKeyToken(reader, assembly.PublicKey);
35
src/WixToolset.Core/VariableResolver.cs
+1
-1
@@ -99,7 +99,7 @@ namespace WixToolset.Core
99
var sb = new StringBuilder(value);
100
101
// notice how this code walks backward through the list
102
- // because it modifies the string as we through it
102
+ // because it modifies the string as we move through it
103
for (int i = matches.Count - 1; 0 <= i; i--)
104
{
105
var variableNamespace = matches[i].Groups["namespace"].Value;