aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-05-23 01:53:03 -0700
committerRob Mensching <rob@firegiant.com>2020-05-23 02:00:44 -0700
commitf08e7529967fa9870faeee6dfa00f326c65cef1e (patch)
tree6d4cdb72ab4e8fe76aaa58fe99272ee7107deb8c /src
parent6b30680fd7a712b45538c3f0a89d652f0457a893 (diff)
downloadwix-f08e7529967fa9870faeee6dfa00f326c65cef1e.tar.gz
wix-f08e7529967fa9870faeee6dfa00f326c65cef1e.tar.bz2
wix-f08e7529967fa9870faeee6dfa00f326c65cef1e.zip
Minor code cleanup
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs3
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs3
2 files changed, 1 insertions, 5 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 22858d1f..e09c12da 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -155,7 +155,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
155 { 155 {
156 propertyRow.Value = Common.GenerateGuid(); 156 propertyRow.Value = Common.GenerateGuid();
157 157
158#if TODO_FIX_INSTANCE_TRANSFORM // Is this still necessary? 158#if TODO_PATCHING // Is this still necessary?
159 159
160 // Update the target ProductCode in any instance transforms. 160 // Update the target ProductCode in any instance transforms.
161 foreach (SubStorage subStorage in this.Output.SubStorages) 161 foreach (SubStorage subStorage in this.Output.SubStorages)
@@ -294,7 +294,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
294 command.FileFacades = fileFacades; 294 command.FileFacades = fileFacades;
295 command.UpdateFileFacades = fileFacades.Where(f => !f.FromModule); 295 command.UpdateFileFacades = fileFacades.Where(f => !f.FromModule);
296 command.OverwriteHash = true; 296 command.OverwriteHash = true;
297 command.TableDefinitions = tableDefinitions;
298 command.VariableCache = variableCache; 297 command.VariableCache = variableCache;
299 command.Execute(); 298 command.Execute();
300 } 299 }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index 7ecd58d7..4ca5ec48 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -12,7 +12,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
12 using WixToolset.Core.WindowsInstaller.Msi; 12 using WixToolset.Core.WindowsInstaller.Msi;
13 using WixToolset.Data; 13 using WixToolset.Data;
14 using WixToolset.Data.Tuples; 14 using WixToolset.Data.Tuples;
15 using WixToolset.Data.WindowsInstaller;
16 using WixToolset.Extensibility.Services; 15 using WixToolset.Extensibility.Services;
17 16
18 /// <summary> 17 /// <summary>
@@ -36,8 +35,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
36 35
37 public bool OverwriteHash { private get; set; } 36 public bool OverwriteHash { private get; set; }
38 37
39 public TableDefinitionCollection TableDefinitions { private get; set; }
40
41 public IDictionary<string, string> VariableCache { private get; set; } 38 public IDictionary<string, string> VariableCache { private get; set; }
42 39
43 public void Execute() 40 public void Execute()