Rename WixVariableResolver to VariableResolver
Rob Mensching committed
Feb 28, 2019 at 17:03 UTC
138e65b99c215eb8277ad60c16cf7ceb0faff842
3 files changed
+6
-6
src/WixToolset.Core/Compiler.cs
+2
-2
@@ -46,7 +46,7 @@ namespace WixToolset.Core
46
private string activeLanguage;
47
48
// TODO: Implement this differently to not require the VariableResolver.
49
- private WixVariableResolver componentIdPlaceholdersResolver;
49
+ private VariableResolver componentIdPlaceholdersResolver;
50
51
/// <summary>
52
/// Type of RadioButton element in a group.
@@ -132,7 +132,7 @@ namespace WixToolset.Core
132
133
this.Core = new CompilerCore(target, this.Messaging, parseHelper, extensionsByNamespace);
134
this.Core.ShowPedanticMessages = this.ShowPedanticMessages;
135
- this.componentIdPlaceholdersResolver = new WixVariableResolver(this.ServiceProvider);
135
+ this.componentIdPlaceholdersResolver = new VariableResolver(this.ServiceProvider);
136
137
// parse the document
138
var source = this.Context.Source;
src/WixToolset.Core/VariableResolver.cs
renamed
+3
-3
@@ -12,16 +12,16 @@ namespace WixToolset.Core
12
/// <summary>
13
/// WiX variable resolver.
14
/// </summary>
15
- internal class WixVariableResolver : IVariableResolver
15
+ internal class VariableResolver : IVariableResolver
16
{
17
private readonly Dictionary<string, BindVariable> locVariables;
18
private readonly Dictionary<string, BindVariable> wixVariables;
19
private readonly Dictionary<string, LocalizedControl> localizedControls;
20
21
/// <summary>
22
- /// Instantiate a new WixVariableResolver.
22
+ /// Instantiate a new VariableResolver.
23
/// </summary>
24
- internal WixVariableResolver(IServiceProvider serviceProvider)
24
+ internal VariableResolver(IServiceProvider serviceProvider)
25
{
26
this.Messaging = serviceProvider.GetService<IMessaging>();
27
src/WixToolset.Core/WixToolsetServiceProvider.cs
+1
-1
@@ -50,7 +50,7 @@ namespace WixToolset.Core
50
this.AddService<IResolver>((provider, singletons) => new Resolver(provider));
51
52
this.AddService<ILocalizer>((provider, singletons) => new Localizer(provider));
53
- this.AddService<IVariableResolver>((provider, singletons) => new WixVariableResolver(provider));
53
+ this.AddService<IVariableResolver>((provider, singletons) => new VariableResolver(provider));
54
}
55
56
private Dictionary<Type, Func<IServiceProvider, Dictionary<Type, object>, object>> CreationFunctions { get; }