diff options
author | Rob Mensching <rob@firegiant.com> | 2019-10-26 13:40:49 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2019-10-26 13:56:11 -0700 |
commit | 6eab6255f832007886c4b01861dc39d5582177ef (patch) | |
tree | cb3e11ad38046ed74eede94126c9923e4dfc287b /src/WixToolset.Core.WindowsInstaller/Differ.cs | |
parent | f01d284101e95d490497062c2dc9065423d0cf37 (diff) | |
download | wix-6eab6255f832007886c4b01861dc39d5582177ef.tar.gz wix-6eab6255f832007886c4b01861dc39d5582177ef.tar.bz2 wix-6eab6255f832007886c4b01861dc39d5582177ef.zip |
Update to WindowsInstallerData rename from Data
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Differ.cs')
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Differ.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Differ.cs b/src/WixToolset.Core.WindowsInstaller/Differ.cs index 209773e0..32172ffd 100644 --- a/src/WixToolset.Core.WindowsInstaller/Differ.cs +++ b/src/WixToolset.Core.WindowsInstaller/Differ.cs | |||
@@ -81,7 +81,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
81 | /// <param name="targetOutput">The target output.</param> | 81 | /// <param name="targetOutput">The target output.</param> |
82 | /// <param name="updatedOutput">The updated output.</param> | 82 | /// <param name="updatedOutput">The updated output.</param> |
83 | /// <returns>The transform.</returns> | 83 | /// <returns>The transform.</returns> |
84 | public Output Diff(Output targetOutput, Output updatedOutput) | 84 | public WindowsInstallerData Diff(WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput) |
85 | { | 85 | { |
86 | return this.Diff(targetOutput, updatedOutput, 0); | 86 | return this.Diff(targetOutput, updatedOutput, 0); |
87 | } | 87 | } |
@@ -93,9 +93,9 @@ namespace WixToolset.Core.WindowsInstaller | |||
93 | /// <param name="updatedOutput">The updated output.</param> | 93 | /// <param name="updatedOutput">The updated output.</param> |
94 | /// <param name="validationFlags"></param> | 94 | /// <param name="validationFlags"></param> |
95 | /// <returns>The transform.</returns> | 95 | /// <returns>The transform.</returns> |
96 | public Output Diff(Output targetOutput, Output updatedOutput, TransformFlags validationFlags) | 96 | public WindowsInstallerData Diff(WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput, TransformFlags validationFlags) |
97 | { | 97 | { |
98 | Output transform = new Output(null); | 98 | WindowsInstallerData transform = new WindowsInstallerData(null); |
99 | transform.Type = OutputType.Transform; | 99 | transform.Type = OutputType.Transform; |
100 | transform.Codepage = updatedOutput.Codepage; | 100 | transform.Codepage = updatedOutput.Codepage; |
101 | this.transformSummaryInfo = new SummaryInformationStreams(); | 101 | this.transformSummaryInfo = new SummaryInformationStreams(); |
@@ -338,7 +338,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
338 | return comparedRow; | 338 | return comparedRow; |
339 | } | 339 | } |
340 | 340 | ||
341 | private List<Row> CompareTables(Output targetOutput, Table targetTable, Table updatedTable, out TableOperation operation) | 341 | private List<Row> CompareTables(WindowsInstallerData targetOutput, Table targetTable, Table updatedTable, out TableOperation operation) |
342 | { | 342 | { |
343 | List<Row> rows = new List<Row>(); | 343 | List<Row> rows = new List<Row>(); |
344 | operation = TableOperation.None; | 344 | operation = TableOperation.None; |