From f41cae1bbe966e9204307f8a83d5748d324c0a71 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 18 Mar 2020 21:43:16 -0400 Subject: Allow unresolved variables during resolution. --- src/WixToolset.Extensibility/Data/IResolveContext.cs | 3 ++- src/WixToolset.Extensibility/Services/IVariableResolver.cs | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/WixToolset.Extensibility/Data/IResolveContext.cs b/src/WixToolset.Extensibility/Data/IResolveContext.cs index 8af79cff..608ce5d5 100644 --- a/src/WixToolset.Extensibility/Data/IResolveContext.cs +++ b/src/WixToolset.Extensibility/Data/IResolveContext.cs @@ -5,7 +5,6 @@ namespace WixToolset.Extensibility.Data using System; using System.Collections.Generic; using WixToolset.Data; - using WixToolset.Extensibility.Services; public interface IResolveContext { @@ -24,5 +23,7 @@ namespace WixToolset.Extensibility.Data Intermediate IntermediateRepresentation { get; set; } IEnumerable Localizations { get; set; } + + bool AllowUnresolvedVariables { get; set; } } } diff --git a/src/WixToolset.Extensibility/Services/IVariableResolver.cs b/src/WixToolset.Extensibility/Services/IVariableResolver.cs index 5d647fda..a108e146 100644 --- a/src/WixToolset.Extensibility/Services/IVariableResolver.cs +++ b/src/WixToolset.Extensibility/Services/IVariableResolver.cs @@ -24,6 +24,15 @@ namespace WixToolset.Extensibility.Services /// The resolved result. IVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value); + /// + /// Resolve the wix variables in a value. + /// + /// The source line information for the value. + /// The value to resolve. + /// true if unknown variables should throw errors. + /// The resolved value. + IVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool errorOnUnknown); + /// /// Try to find localization information for dialog and (optional) control. /// -- cgit v1.2.3-55-g6feb