diff options
Diffstat (limited to 'src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs')
| -rw-r--r-- | src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs index 4585b71a..3ded9a87 100644 --- a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs +++ b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs | |||
| @@ -7,6 +7,7 @@ namespace WixToolset.Core.Bind | |||
| 7 | using System.Globalization; | 7 | using System.Globalization; |
| 8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
| 9 | using WixToolset.Extensibility; | 9 | using WixToolset.Extensibility; |
| 10 | using WixToolset.Extensibility.Services; | ||
| 10 | 11 | ||
| 11 | /// <summary> | 12 | /// <summary> |
| 12 | /// Resolves the fields which had variables that needed to be resolved after the file information | 13 | /// Resolves the fields which had variables that needed to be resolved after the file information |
| @@ -19,12 +20,15 @@ namespace WixToolset.Core.Bind | |||
| 19 | /// </summary> | 20 | /// </summary> |
| 20 | /// <param name="delayedFields">The fields which had resolution delayed.</param> | 21 | /// <param name="delayedFields">The fields which had resolution delayed.</param> |
| 21 | /// <param name="variableCache">The file information to use when resolving variables.</param> | 22 | /// <param name="variableCache">The file information to use when resolving variables.</param> |
| 22 | public ResolveDelayedFieldsCommand(IEnumerable<IDelayedField> delayedFields, Dictionary<string, string> variableCache) | 23 | public ResolveDelayedFieldsCommand(IMessaging messaging, IEnumerable<IDelayedField> delayedFields, Dictionary<string, string> variableCache) |
| 23 | { | 24 | { |
| 25 | this.Messaging = messaging; | ||
| 24 | this.DelayedFields = delayedFields; | 26 | this.DelayedFields = delayedFields; |
| 25 | this.VariableCache = variableCache; | 27 | this.VariableCache = variableCache; |
| 26 | } | 28 | } |
| 27 | 29 | ||
| 30 | private IMessaging Messaging { get; } | ||
| 31 | |||
| 28 | private IEnumerable<IDelayedField> DelayedFields { get;} | 32 | private IEnumerable<IDelayedField> DelayedFields { get;} |
| 29 | 33 | ||
| 30 | private IDictionary<string, string> VariableCache { get; } | 34 | private IDictionary<string, string> VariableCache { get; } |
| @@ -58,7 +62,7 @@ namespace WixToolset.Core.Bind | |||
| 58 | } | 62 | } |
| 59 | catch (WixException we) | 63 | catch (WixException we) |
| 60 | { | 64 | { |
| 61 | Messaging.Instance.OnMessage(we.Error); | 65 | this.Messaging.Write(we.Error); |
| 62 | continue; | 66 | continue; |
| 63 | } | 67 | } |
| 64 | } | 68 | } |
| @@ -103,7 +107,7 @@ namespace WixToolset.Core.Bind | |||
| 103 | } | 107 | } |
| 104 | catch (WixException we) | 108 | catch (WixException we) |
| 105 | { | 109 | { |
| 106 | Messaging.Instance.OnMessage(we.Error); | 110 | this.Messaging.Write(we.Error); |
| 107 | } | 111 | } |
| 108 | } | 112 | } |
| 109 | } | 113 | } |
