diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-05-22 14:51:59 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-05-22 15:25:19 -0700 |
| commit | 236f958468923f65a8f02e406601fb47e71cd58e (patch) | |
| tree | 1d5d415618e44e6387f68fbc1c2232931cd82198 /src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |
| parent | e8030ca17ff96a794a3fecd66bb01b81581a5451 (diff) | |
| download | wix-236f958468923f65a8f02e406601fb47e71cd58e.tar.gz wix-236f958468923f65a8f02e406601fb47e71cd58e.tar.bz2 wix-236f958468923f65a8f02e406601fb47e71cd58e.zip | |
Minor code cleanup
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 5c84a82f..32da410f 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
| @@ -452,7 +452,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 452 | command.FileRowsByCabinet = filesByCabinetMedia; | 452 | command.FileRowsByCabinet = filesByCabinetMedia; |
| 453 | command.ResolveMedia = this.ResolveMedia; | 453 | command.ResolveMedia = this.ResolveMedia; |
| 454 | command.TableDefinitions = tableDefinitions; | 454 | command.TableDefinitions = tableDefinitions; |
| 455 | command.TempFilesLocation = this.IntermediateFolder; | 455 | command.IntermediateFolder = this.IntermediateFolder; |
| 456 | command.Execute(); | 456 | command.Execute(); |
| 457 | 457 | ||
| 458 | fileTransfers.AddRange(command.FileTransfers); | 458 | fileTransfers.AddRange(command.FileTransfers); |
| @@ -887,8 +887,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 887 | /// </remarks> | 887 | /// </remarks> |
| 888 | private void ValidateComponentGuids(WindowsInstallerData output) | 888 | private void ValidateComponentGuids(WindowsInstallerData output) |
| 889 | { | 889 | { |
| 890 | Table componentTable = output.Tables["Component"]; | 890 | if (output.TryGetTable("Component", out var componentTable)) |
| 891 | if (null != componentTable) | ||
| 892 | { | 891 | { |
| 893 | Dictionary<string, bool> componentGuidConditions = new Dictionary<string, bool>(componentTable.Rows.Count); | 892 | Dictionary<string, bool> componentGuidConditions = new Dictionary<string, bool>(componentTable.Rows.Count); |
| 894 | 893 | ||
