aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-10-26 13:40:49 -0700
committerRob Mensching <rob@firegiant.com>2019-10-26 13:56:11 -0700
commit6eab6255f832007886c4b01861dc39d5582177ef (patch)
treecb3e11ad38046ed74eede94126c9923e4dfc287b /src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
parentf01d284101e95d490497062c2dc9065423d0cf37 (diff)
downloadwix-6eab6255f832007886c4b01861dc39d5582177ef.tar.gz
wix-6eab6255f832007886c4b01861dc39d5582177ef.tar.bz2
wix-6eab6255f832007886c4b01861dc39d5582177ef.zip
Update to WindowsInstallerData rename from Data
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
index bf282e99..bdf8d542 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
@@ -39,9 +39,9 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
39 39
40 private string EmptyFile { get; set; } 40 private string EmptyFile { get; set; }
41 41
42 public Output Execute() 42 public WindowsInstallerData Execute()
43 { 43 {
44 Output transform = new Output(new SourceLineNumber(this.TransformFile)); 44 WindowsInstallerData transform = new WindowsInstallerData(new SourceLineNumber(this.TransformFile));
45 transform.Type = OutputType.Transform; 45 transform.Type = OutputType.Transform;
46 46
47 // get the summary information table 47 // get the summary information table
@@ -63,7 +63,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
63 } 63 }
64 64
65 // create a schema msi which hopefully matches the table schemas in the transform 65 // create a schema msi which hopefully matches the table schemas in the transform
66 Output schemaOutput = new Output(null); 66 WindowsInstallerData schemaOutput = new WindowsInstallerData(null);
67 string msiDatabaseFile = Path.Combine(this.IntermediateFolder, "schema.msi"); 67 string msiDatabaseFile = Path.Combine(this.IntermediateFolder, "schema.msi");
68 foreach (TableDefinition tableDefinition in this.TableDefinitions) 68 foreach (TableDefinition tableDefinition in this.TableDefinitions)
69 { 69 {
@@ -88,7 +88,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
88 88
89 // unbind the database 89 // unbind the database
90 var unbindCommand = new UnbindDatabaseCommand(this.Messaging, msiDatabase, msiDatabaseFile, OutputType.Product, this.ExportBasePath, this.IntermediateFolder, false, false, skipSummaryInfo: true); 90 var unbindCommand = new UnbindDatabaseCommand(this.Messaging, msiDatabase, msiDatabaseFile, OutputType.Product, this.ExportBasePath, this.IntermediateFolder, false, false, skipSummaryInfo: true);
91 Output transformViewOutput = unbindCommand.Execute(); 91 WindowsInstallerData transformViewOutput = unbindCommand.Execute();
92 92
93 // index the added and possibly modified rows (added rows may also appears as modified rows) 93 // index the added and possibly modified rows (added rows may also appears as modified rows)
94 transformViewTable = transformViewOutput.Tables["_TransformView"]; 94 transformViewTable = transformViewOutput.Tables["_TransformView"];
@@ -158,7 +158,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
158 158
159 // unbind the database 159 // unbind the database
160 var unbindCommand = new UnbindDatabaseCommand(this.Messaging, msiDatabase, msiDatabaseFile, OutputType.Product, this.ExportBasePath, this.IntermediateFolder, false, false, skipSummaryInfo: true); 160 var unbindCommand = new UnbindDatabaseCommand(this.Messaging, msiDatabase, msiDatabaseFile, OutputType.Product, this.ExportBasePath, this.IntermediateFolder, false, false, skipSummaryInfo: true);
161 Output output = unbindCommand.Execute(); 161 WindowsInstallerData output = unbindCommand.Execute();
162 162
163 // index all the rows to easily find modified rows 163 // index all the rows to easily find modified rows
164 Hashtable rows = new Hashtable(); 164 Hashtable rows = new Hashtable();
@@ -240,7 +240,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
240 return transform; 240 return transform;
241 } 241 }
242 242
243 private void GenerateDatabase(Output output, string databaseFile) 243 private void GenerateDatabase(WindowsInstallerData output, string databaseFile)
244 { 244 {
245 var command = new GenerateDatabaseCommand(); 245 var command = new GenerateDatabaseCommand();
246 command.Extensions = Array.Empty<IFileSystemExtension>(); 246 command.Extensions = Array.Empty<IFileSystemExtension>();