diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-03-18 21:45:53 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-18 21:50:00 -0400 |
| commit | c5df86a7caaa1cbff9adde6396925383ba9a2e4e (patch) | |
| tree | a082d0a8eaa759a3ba78cfedb0d89a1ebfac8a8e /src/WixToolset.Core/Bind | |
| parent | f1ddeb81aa8c709582fc11a5711b39da596f4f22 (diff) | |
| download | wix-c5df86a7caaa1cbff9adde6396925383ba9a2e4e.tar.gz wix-c5df86a7caaa1cbff9adde6396925383ba9a2e4e.tar.bz2 wix-c5df86a7caaa1cbff9adde6396925383ba9a2e4e.zip | |
Allow unresolved variables during resolution.
Diffstat (limited to 'src/WixToolset.Core/Bind')
| -rw-r--r-- | src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs index 5db878a1..3e680a98 100644 --- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs +++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | |||
| @@ -32,6 +32,8 @@ namespace WixToolset.Core.Bind | |||
| 32 | 32 | ||
| 33 | public bool SupportDelayedResolution { private get; set; } | 33 | public bool SupportDelayedResolution { private get; set; } |
| 34 | 34 | ||
| 35 | public bool AllowUnresolvedVariables { private get; set; } | ||
| 36 | |||
| 35 | public IEnumerable<DelayedField> DelayedFields { get; private set; } | 37 | public IEnumerable<DelayedField> DelayedFields { get; private set; } |
| 36 | 38 | ||
| 37 | public void Execute() | 39 | public void Execute() |
| @@ -62,7 +64,7 @@ namespace WixToolset.Core.Bind | |||
| 62 | var original = field.AsString(); | 64 | var original = field.AsString(); |
| 63 | if (!String.IsNullOrEmpty(original)) | 65 | if (!String.IsNullOrEmpty(original)) |
| 64 | { | 66 | { |
| 65 | var resolution = this.VariableResolver.ResolveVariables(tuple.SourceLineNumbers, original); | 67 | var resolution = this.VariableResolver.ResolveVariables(tuple.SourceLineNumbers, original, !this.AllowUnresolvedVariables); |
| 66 | if (resolution.UpdatedValue) | 68 | if (resolution.UpdatedValue) |
| 67 | { | 69 | { |
| 68 | field.Set(resolution.Value); | 70 | field.Set(resolution.Value); |
