diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-11 21:49:09 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-12 12:46:21 +1000 |
| commit | 6d8b6f79b44b6a41a630aa3aad5a3c7f16701798 (patch) | |
| tree | b82ede9934cb7777a19e74a912c68481e76c21cd /src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs | |
| parent | df69d4172d3117d8b66ba51fa5ae7f4be538700d (diff) | |
| download | wix-6d8b6f79b44b6a41a630aa3aad5a3c7f16701798.tar.gz wix-6d8b6f79b44b6a41a630aa3aad5a3c7f16701798.tar.bz2 wix-6d8b6f79b44b6a41a630aa3aad5a3c7f16701798.zip | |
General cleanup.
Try not to send strings to specify the tuple or table.
Try to avoid using the Set method on tuples.
Always create new tuples and add them to the section in the same line.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs index 81d46b41..7ecd58d7 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs | |||
| @@ -158,8 +158,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 158 | 158 | ||
| 159 | if (null == facade.Hash) | 159 | if (null == facade.Hash) |
| 160 | { | 160 | { |
| 161 | facade.Hash = new MsiFileHashTuple(facade.SourceLineNumber, facade.Identifier); | 161 | facade.Hash = this.Section.AddTuple(new MsiFileHashTuple(facade.SourceLineNumber, facade.Identifier)); |
| 162 | this.Section.Tuples.Add(facade.Hash); | ||
| 163 | } | 162 | } |
| 164 | 163 | ||
| 165 | facade.Hash.Options = 0; | 164 | facade.Hash.Options = 0; |
| @@ -337,23 +336,24 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 337 | 336 | ||
| 338 | // override directly authored value | 337 | // override directly authored value |
| 339 | var lookup = String.Concat(facade.ComponentRef, "/", name); | 338 | var lookup = String.Concat(facade.ComponentRef, "/", name); |
| 340 | if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameRow)) | 339 | if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameTuple)) |
| 341 | { | 340 | { |
| 342 | assemblyNameRow = new MsiAssemblyNameTuple(facade.SourceLineNumber); | 341 | assemblyNameTuple = this.Section.AddTuple(new MsiAssemblyNameTuple(facade.SourceLineNumber) |
| 343 | assemblyNameRow.ComponentRef = facade.ComponentRef; | 342 | { |
| 344 | assemblyNameRow.Name = name; | 343 | ComponentRef = facade.ComponentRef, |
| 345 | assemblyNameRow.Value = value; | 344 | Name = name, |
| 345 | Value = value, | ||
| 346 | }); | ||
| 346 | 347 | ||
| 347 | if (null == facade.AssemblyNames) | 348 | if (null == facade.AssemblyNames) |
| 348 | { | 349 | { |
| 349 | facade.AssemblyNames = new List<MsiAssemblyNameTuple>(); | 350 | facade.AssemblyNames = new List<MsiAssemblyNameTuple>(); |
| 350 | } | 351 | } |
| 351 | 352 | ||
| 352 | facade.AssemblyNames.Add(assemblyNameRow); | 353 | facade.AssemblyNames.Add(assemblyNameTuple); |
| 353 | this.Section.Tuples.Add(assemblyNameRow); | ||
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | assemblyNameRow.Value = value; | 356 | assemblyNameTuple.Value = value; |
| 357 | 357 | ||
| 358 | if (this.VariableCache != null) | 358 | if (this.VariableCache != null) |
| 359 | { | 359 | { |
