diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-03-18 21:43:16 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-18 21:44:36 -0400 |
| commit | f41cae1bbe966e9204307f8a83d5748d324c0a71 (patch) | |
| tree | dda2a4ad42a4d360a2af97c7379c2513c7331354 /src | |
| parent | f7873587d0e45ca802a9775e263c41edb0bdc299 (diff) | |
| download | wix-f41cae1bbe966e9204307f8a83d5748d324c0a71.tar.gz wix-f41cae1bbe966e9204307f8a83d5748d324c0a71.tar.bz2 wix-f41cae1bbe966e9204307f8a83d5748d324c0a71.zip | |
Allow unresolved variables during resolution.
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Extensibility/Data/IResolveContext.cs | 3 | ||||
| -rw-r--r-- | src/WixToolset.Extensibility/Services/IVariableResolver.cs | 9 |
2 files changed, 11 insertions, 1 deletions
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 | |||
| 5 | using System; | 5 | using System; |
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| 7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
| 8 | using WixToolset.Extensibility.Services; | ||
| 9 | 8 | ||
| 10 | public interface IResolveContext | 9 | public interface IResolveContext |
| 11 | { | 10 | { |
| @@ -24,5 +23,7 @@ namespace WixToolset.Extensibility.Data | |||
| 24 | Intermediate IntermediateRepresentation { get; set; } | 23 | Intermediate IntermediateRepresentation { get; set; } |
| 25 | 24 | ||
| 26 | IEnumerable<Localization> Localizations { get; set; } | 25 | IEnumerable<Localization> Localizations { get; set; } |
| 26 | |||
| 27 | bool AllowUnresolvedVariables { get; set; } | ||
| 27 | } | 28 | } |
| 28 | } | 29 | } |
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 | |||
| @@ -25,6 +25,15 @@ namespace WixToolset.Extensibility.Services | |||
| 25 | IVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value); | 25 | IVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value); |
| 26 | 26 | ||
| 27 | /// <summary> | 27 | /// <summary> |
| 28 | /// Resolve the wix variables in a value. | ||
| 29 | /// </summary> | ||
| 30 | /// <param name="sourceLineNumbers">The source line information for the value.</param> | ||
| 31 | /// <param name="value">The value to resolve.</param> | ||
| 32 | /// <param name="errorOnUnknown">true if unknown variables should throw errors.</param> | ||
| 33 | /// <returns>The resolved value.</returns> | ||
| 34 | IVariableResolution ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool errorOnUnknown); | ||
| 35 | |||
| 36 | /// <summary> | ||
| 28 | /// Try to find localization information for dialog and (optional) control. | 37 | /// Try to find localization information for dialog and (optional) control. |
| 29 | /// </summary> | 38 | /// </summary> |
| 30 | /// <param name="dialog">Dialog identifier.</param> | 39 | /// <param name="dialog">Dialog identifier.</param> |
