From f08e7529967fa9870faeee6dfa00f326c65cef1e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 23 May 2020 01:53:03 -0700
Subject: Minor code cleanup
---
src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 3 +--
src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs | 3 ---
2 files changed, 1 insertion(+), 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
{
propertyRow.Value = Common.GenerateGuid();
-#if TODO_FIX_INSTANCE_TRANSFORM // Is this still necessary?
+#if TODO_PATCHING // Is this still necessary?
// Update the target ProductCode in any instance transforms.
foreach (SubStorage subStorage in this.Output.SubStorages)
@@ -294,7 +294,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
command.FileFacades = fileFacades;
command.UpdateFileFacades = fileFacades.Where(f => !f.FromModule);
command.OverwriteHash = true;
- command.TableDefinitions = tableDefinitions;
command.VariableCache = variableCache;
command.Execute();
}
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
using WixToolset.Core.WindowsInstaller.Msi;
using WixToolset.Data;
using WixToolset.Data.Tuples;
- using WixToolset.Data.WindowsInstaller;
using WixToolset.Extensibility.Services;
/// <summary>
@@ -36,8 +35,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
public bool OverwriteHash { private get; set; }
- public TableDefinitionCollection TableDefinitions { private get; set; }
-
public IDictionary<string, string> VariableCache { private get; set; }
public void Execute()
--
cgit v1.2.3-55-g6feb