diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-02-28 16:56:01 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@robmensching.com> | 2019-03-01 07:57:55 -0800 |
| commit | a4be3486b60d232b546f438bc4bd7a4a80cf330c (patch) | |
| tree | ee9dcba4476e4a4bee2a24e397612f816883cecf /src/WixToolset.Core/Compiler.cs | |
| parent | a4cd45daef6b6705c0fcf2296e2a78427f702b30 (diff) | |
| download | wix-a4be3486b60d232b546f438bc4bd7a4a80cf330c.tar.gz wix-a4be3486b60d232b546f438bc4bd7a4a80cf330c.tar.bz2 wix-a4be3486b60d232b546f438bc4bd7a4a80cf330c.zip | |
Expose WixVariableResolver via WixToolsetServiceProvider
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 06a7dd10..da42506a 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -45,6 +45,7 @@ namespace WixToolset.Core | |||
| 45 | private string activeName; | 45 | private string activeName; |
| 46 | private string activeLanguage; | 46 | private string activeLanguage; |
| 47 | 47 | ||
| 48 | // TODO: Implement this differently to not require the VariableResolver. | ||
| 48 | private WixVariableResolver componentIdPlaceholdersResolver; | 49 | private WixVariableResolver componentIdPlaceholdersResolver; |
| 49 | 50 | ||
| 50 | /// <summary> | 51 | /// <summary> |
| @@ -131,7 +132,7 @@ namespace WixToolset.Core | |||
| 131 | 132 | ||
| 132 | this.Core = new CompilerCore(target, this.Messaging, parseHelper, extensionsByNamespace); | 133 | this.Core = new CompilerCore(target, this.Messaging, parseHelper, extensionsByNamespace); |
| 133 | this.Core.ShowPedanticMessages = this.ShowPedanticMessages; | 134 | this.Core.ShowPedanticMessages = this.ShowPedanticMessages; |
| 134 | this.componentIdPlaceholdersResolver = new WixVariableResolver(this.Messaging); | 135 | this.componentIdPlaceholdersResolver = new WixVariableResolver(this.ServiceProvider); |
| 135 | 136 | ||
| 136 | // parse the document | 137 | // parse the document |
| 137 | var source = this.Context.Source; | 138 | var source = this.Context.Source; |
