aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Bind/ResolveFieldsCommand.cs')
-rw-r--r--src/WixToolset.Core/Bind/ResolveFieldsCommand.cs8
1 files changed, 4 insertions, 4 deletions
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
89 { 89 {
90 var objectField = field.AsPath(); 90 var objectField = field.AsPath();
91 91
92#if REVISIT_FOR_PATCHING 92#if TODO_PATCHING
93 // Skip file resolution if the file is to be deleted. 93 // Skip file resolution if the file is to be deleted.
94 if (RowOperation.Delete == tuple.Operation) 94 if (RowOperation.Delete == tuple.Operation)
95 { 95 {
@@ -111,7 +111,7 @@ namespace WixToolset.Core.Bind
111 { 111 {
112 if (!this.BuildingPatch) // Normal binding for non-Patch scenario such as link (light.exe) 112 if (!this.BuildingPatch) // Normal binding for non-Patch scenario such as link (light.exe)
113 { 113 {
114#if REVISIT_FOR_PATCHING 114#if TODO_PATCHING
115 // keep a copy of the un-resolved data for future replay. This will be saved into wixpdb file 115 // keep a copy of the un-resolved data for future replay. This will be saved into wixpdb file
116 if (null == objectField.UnresolvedData) 116 if (null == objectField.UnresolvedData)
117 { 117 {
@@ -129,7 +129,7 @@ namespace WixToolset.Core.Bind
129 var value = fileResolver.ResolveFile(objectField.Path, tuple.Definition, tuple.SourceLineNumbers, BindStage.Normal); 129 var value = fileResolver.ResolveFile(objectField.Path, tuple.Definition, tuple.SourceLineNumbers, BindStage.Normal);
130 field.Set(value); 130 field.Set(value);
131 } 131 }
132#if REVISIT_FOR_PATCHING 132#if TODO_PATCHING
133 else // Re-base binding path scenario caused by pyro.exe -bt -bu 133 else // Re-base binding path scenario caused by pyro.exe -bt -bu
134 { 134 {
135 // by default, use the resolved Data for file lookup 135 // by default, use the resolved Data for file lookup
@@ -158,7 +158,7 @@ namespace WixToolset.Core.Bind
158 } 158 }
159 } 159 }
160 160
161#if REVISIT_FOR_PATCHING 161#if TODO_PATCHING
162 if (null != objectField.PreviousData) 162 if (null != objectField.PreviousData)
163 { 163 {
164 objectField.PreviousData = this.BindVariableResolver.ResolveVariables(tuple.SourceLineNumbers, objectField.PreviousData, false, out isDefault); 164 objectField.PreviousData = this.BindVariableResolver.ResolveVariables(tuple.SourceLineNumbers, objectField.PreviousData, false, out isDefault);