diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-11-11 01:45:59 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-11-11 01:45:59 -0800 |
| commit | 9f8cb5374481b6c8a06eb2739858332350f72666 (patch) | |
| tree | 4b09b90d8a516cb5e7d8203759bd2489b6a5d20c /src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs | |
| parent | 2bb37beda887d120a0ddabf874ad25357101faa1 (diff) | |
| download | wix-9f8cb5374481b6c8a06eb2739858332350f72666.tar.gz wix-9f8cb5374481b6c8a06eb2739858332350f72666.tar.bz2 wix-9f8cb5374481b6c8a06eb2739858332350f72666.zip | |
Additional IR updates
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs index 6388a352..0dcddb99 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 2 | 2 | ||
| 3 | namespace WixToolset.Core.WindowsInstaller.Databases | 3 | namespace WixToolset.Core.WindowsInstaller.Bind |
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| @@ -10,6 +10,7 @@ namespace WixToolset.Core.WindowsInstaller.Databases | |||
| 10 | using WixToolset.Extensibility; | 10 | using WixToolset.Extensibility; |
| 11 | using WixToolset.Core.Native; | 11 | using WixToolset.Core.Native; |
| 12 | using WixToolset.Core.Bind; | 12 | using WixToolset.Core.Bind; |
| 13 | using WixToolset.Data.Tuples; | ||
| 13 | 14 | ||
| 14 | internal class CopyTransformDataCommand | 15 | internal class CopyTransformDataCommand |
| 15 | { | 16 | { |
| @@ -29,7 +30,7 @@ namespace WixToolset.Core.WindowsInstaller.Databases | |||
| 29 | 30 | ||
| 30 | List<FileFacade> allFileRows = this.CopyOutFileRows ? new List<FileFacade>() : null; | 31 | List<FileFacade> allFileRows = this.CopyOutFileRows ? new List<FileFacade>() : null; |
| 31 | 32 | ||
| 32 | #if false // TODO: Fix this patching related code to work correctly with FileFacades. | 33 | #if REVISIT_FOR_PATCHING // TODO: Fix this patching related code to work correctly with FileFacades. |
| 33 | bool copyToPatch = (allFileRows != null); | 34 | bool copyToPatch = (allFileRows != null); |
| 34 | bool copyFromPatch = !copyToPatch; | 35 | bool copyFromPatch = !copyToPatch; |
| 35 | 36 | ||
| @@ -454,7 +455,7 @@ namespace WixToolset.Core.WindowsInstaller.Databases | |||
| 454 | } | 455 | } |
| 455 | 456 | ||
| 456 | Row patchAction = iesTable.CreateRow(null); | 457 | Row patchAction = iesTable.CreateRow(null); |
| 457 | WixActionRow wixPatchAction = WindowsInstallerStandard.GetStandardActions()[table, "PatchFiles"]; | 458 | WixActionRow wixPatchAction = WindowsInstallerStandardInternal.GetStandardActionRows()[table, "PatchFiles"]; |
| 458 | int sequence = wixPatchAction.Sequence; | 459 | int sequence = wixPatchAction.Sequence; |
| 459 | // Test for default sequence value's appropriateness | 460 | // Test for default sequence value's appropriateness |
| 460 | if (seqInstallFiles >= sequence || (0 != seqDuplicateFiles && seqDuplicateFiles <= sequence)) | 461 | if (seqInstallFiles >= sequence || (0 != seqDuplicateFiles && seqDuplicateFiles <= sequence)) |
