diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:43:50 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:50:31 -0700 |
| commit | 38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch) | |
| tree | 803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs | |
| parent | 8968578d50858721317d410549a9f9b5c62bf1f7 (diff) | |
| download | wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2 wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip | |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs index f65f885b..76e6dd56 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs | |||
| @@ -9,7 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 9 | using WixToolset.Core.WindowsInstaller.Msi; | 9 | using WixToolset.Core.WindowsInstaller.Msi; |
| 10 | using WixToolset.Core.WindowsInstaller.Unbind; | 10 | using WixToolset.Core.WindowsInstaller.Unbind; |
| 11 | using WixToolset.Data; | 11 | using WixToolset.Data; |
| 12 | using WixToolset.Data.Tuples; | 12 | using WixToolset.Data.Symbols; |
| 13 | using WixToolset.Data.WindowsInstaller; | 13 | using WixToolset.Data.WindowsInstaller; |
| 14 | using WixToolset.Extensibility.Services; | 14 | using WixToolset.Extensibility.Services; |
| 15 | 15 | ||
| @@ -34,16 +34,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 34 | { | 34 | { |
| 35 | var patchTransforms = new List<PatchTransform>(); | 35 | var patchTransforms = new List<PatchTransform>(); |
| 36 | 36 | ||
| 37 | var tuples = this.Intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixPatchBaselineTuple>(); | 37 | var symbols = this.Intermediate.Sections.SelectMany(s => s.Symbols).OfType<WixPatchBaselineSymbol>(); |
| 38 | 38 | ||
| 39 | foreach (var tuple in tuples) | 39 | foreach (var symbol in symbols) |
| 40 | { | 40 | { |
| 41 | WindowsInstallerData transform; | 41 | WindowsInstallerData transform; |
| 42 | 42 | ||
| 43 | if (tuple.TransformFile is null) | 43 | if (symbol.TransformFile is null) |
| 44 | { | 44 | { |
| 45 | var baselineData = this.GetData(tuple.BaselineFile.Path); | 45 | var baselineData = this.GetData(symbol.BaselineFile.Path); |
| 46 | var updateData = this.GetData(tuple.UpdateFile.Path); | 46 | var updateData = this.GetData(symbol.UpdateFile.Path); |
| 47 | 47 | ||
| 48 | var command = new GenerateTransformCommand(this.Messaging, baselineData, updateData, preserveUnchangedRows: true, showPedanticMessages: false); | 48 | var command = new GenerateTransformCommand(this.Messaging, baselineData, updateData, preserveUnchangedRows: true, showPedanticMessages: false); |
| 49 | transform = command.Execute(); | 49 | transform = command.Execute(); |
| @@ -52,11 +52,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 52 | { | 52 | { |
| 53 | var exportBasePath = Path.Combine(this.IntermediateFolder, "_trans"); // TODO: come up with a better path. | 53 | var exportBasePath = Path.Combine(this.IntermediateFolder, "_trans"); // TODO: come up with a better path. |
| 54 | 54 | ||
| 55 | var command = new UnbindTransformCommand(this.Messaging, tuple.TransformFile.Path, exportBasePath, this.IntermediateFolder); | 55 | var command = new UnbindTransformCommand(this.Messaging, symbol.TransformFile.Path, exportBasePath, this.IntermediateFolder); |
| 56 | transform = command.Execute(); | 56 | transform = command.Execute(); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | patchTransforms.Add(new PatchTransform(tuple.Id.Id, transform)); | 59 | patchTransforms.Add(new PatchTransform(symbol.Id.Id, transform)); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | this.PatchTransforms = patchTransforms; | 62 | this.PatchTransforms = patchTransforms; |
