From 6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 24 Jan 2020 15:27:20 -0800 Subject: Start on new patch infrastructure --- src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/WixToolset.Core/Bind/ResolveFieldsCommand.cs') diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs index 19a26915..5cb2524d 100644 --- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs +++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs @@ -89,7 +89,7 @@ namespace WixToolset.Core.Bind { var objectField = field.AsPath(); -#if REVISIT_FOR_PATCHING +#if TODO_PATCHING // Skip file resolution if the file is to be deleted. if (RowOperation.Delete == tuple.Operation) { @@ -111,7 +111,7 @@ namespace WixToolset.Core.Bind { if (!this.BuildingPatch) // Normal binding for non-Patch scenario such as link (light.exe) { -#if REVISIT_FOR_PATCHING +#if TODO_PATCHING // keep a copy of the un-resolved data for future replay. This will be saved into wixpdb file if (null == objectField.UnresolvedData) { @@ -129,7 +129,7 @@ namespace WixToolset.Core.Bind var value = fileResolver.ResolveFile(objectField.Path, tuple.Definition, tuple.SourceLineNumbers, BindStage.Normal); field.Set(value); } -#if REVISIT_FOR_PATCHING +#if TODO_PATCHING else // Re-base binding path scenario caused by pyro.exe -bt -bu { // by default, use the resolved Data for file lookup @@ -158,7 +158,7 @@ namespace WixToolset.Core.Bind } } -#if REVISIT_FOR_PATCHING +#if TODO_PATCHING if (null != objectField.PreviousData) { objectField.PreviousData = this.BindVariableResolver.ResolveVariables(tuple.SourceLineNumbers, objectField.PreviousData, false, out isDefault); -- cgit v1.2.3-55-g6feb