diff options
author | Bob Arnson <bob@firegiant.com> | 2020-02-27 13:39:49 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-02-27 13:59:17 -0500 |
commit | 6a44e7d41c8b87e95f195f732402fb928c7079c1 (patch) | |
tree | 1d02e0246519697319cff08282077536217e6abf | |
parent | 987fc682cb5255e1e81ed71b02c8a9ca8541886d (diff) | |
download | wix-6a44e7d41c8b87e95f195f732402fb928c7079c1.tar.gz wix-6a44e7d41c8b87e95f195f732402fb928c7079c1.tar.bz2 wix-6a44e7d41c8b87e95f195f732402fb928c7079c1.zip |
Detect MSIL for assembly name harvesting.
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Core/VariableResolver.cs | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
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" : 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(); | 33 | var version = assembly.Version.ToString(); |
34 | var publicKeyToken = ReadPublicKeyToken(reader, assembly.PublicKey); | 34 | var publicKeyToken = ReadPublicKeyToken(reader, assembly.PublicKey); |
35 | 35 | ||
diff --git a/src/WixToolset.Core/VariableResolver.cs b/src/WixToolset.Core/VariableResolver.cs index 189fb883..3e0b65b3 100644 --- a/src/WixToolset.Core/VariableResolver.cs +++ b/src/WixToolset.Core/VariableResolver.cs | |||
@@ -99,7 +99,7 @@ namespace WixToolset.Core | |||
99 | var sb = new StringBuilder(value); | 99 | var sb = new StringBuilder(value); |
100 | 100 | ||
101 | // notice how this code walks backward through the list | 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--) | 103 | for (int i = matches.Count - 1; 0 <= i; i--) |
104 | { | 104 | { |
105 | var variableNamespace = matches[i].Groups["namespace"].Value; | 105 | var variableNamespace = matches[i].Groups["namespace"].Value; |