diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-30 17:09:15 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-30 17:09:15 -0800 |
| commit | c5190ae74ab8fe13609362efce88fa4b8cc24f34 (patch) | |
| tree | e7762224afad491c37b70bab13756552c72fdd26 /src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | |
| parent | d4f73e72985dc2f36e4228358f4dc9b6114414ab (diff) | |
| download | wix-c5190ae74ab8fe13609362efce88fa4b8cc24f34.tar.gz wix-c5190ae74ab8fe13609362efce88fa4b8cc24f34.tar.bz2 wix-c5190ae74ab8fe13609362efce88fa4b8cc24f34.zip | |
Fix resolution of localizations that are embedded in intermediates
Diffstat (limited to 'src/WixToolset.Core/Bind/ResolveFieldsCommand.cs')
| -rw-r--r-- | src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs index 824eb9a5..744f022c 100644 --- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs +++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | |||
| @@ -18,7 +18,7 @@ namespace WixToolset.Core.Bind | |||
| 18 | 18 | ||
| 19 | public bool BuildingPatch { private get; set; } | 19 | public bool BuildingPatch { private get; set; } |
| 20 | 20 | ||
| 21 | public IBindVariableResolver BindVariableResolver { private get; set; } | 21 | public IVariableResolver VariableResolver { private get; set; } |
| 22 | 22 | ||
| 23 | public IEnumerable<BindPath> BindPaths { private get; set; } | 23 | public IEnumerable<BindPath> BindPaths { private get; set; } |
| 24 | 24 | ||
| @@ -62,7 +62,7 @@ namespace WixToolset.Core.Bind | |||
| 62 | var original = field.AsString(); | 62 | var original = field.AsString(); |
| 63 | if (!String.IsNullOrEmpty(original)) | 63 | if (!String.IsNullOrEmpty(original)) |
| 64 | { | 64 | { |
| 65 | var resolution = this.BindVariableResolver.ResolveVariables(row.SourceLineNumbers, original, false); | 65 | var resolution = this.VariableResolver.ResolveVariables(row.SourceLineNumbers, original, false); |
| 66 | if (resolution.UpdatedValue) | 66 | if (resolution.UpdatedValue) |
| 67 | { | 67 | { |
| 68 | field.Set(resolution.Value); | 68 | field.Set(resolution.Value); |
