diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-07-23 14:21:40 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-07-23 14:27:11 -0700 |
| commit | 5a1afc9030a1fcc101b6bb52b576fbbfa3ad33c2 (patch) | |
| tree | d409a2399bd831f16ecdb8e68947ea672dcd65d4 /src/WixToolset.Core.WindowsInstaller/Validator.cs | |
| parent | 2724cfee4c163f3297ee25edfd2372767cfd4945 (diff) | |
| download | wix-5a1afc9030a1fcc101b6bb52b576fbbfa3ad33c2.tar.gz wix-5a1afc9030a1fcc101b6bb52b576fbbfa3ad33c2.tar.bz2 wix-5a1afc9030a1fcc101b6bb52b576fbbfa3ad33c2.zip | |
Integrate Extensibility.Data namespace change from Extensibility repo
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Validator.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Validator.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs index 5f41e88d..cbe489be 100644 --- a/src/WixToolset.Core.WindowsInstaller/Validator.cs +++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs | |||
| @@ -16,6 +16,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
| 16 | using WixToolset.Data; | 16 | using WixToolset.Data; |
| 17 | using WixToolset.Data.WindowsInstaller; | 17 | using WixToolset.Data.WindowsInstaller; |
| 18 | using WixToolset.Extensibility; | 18 | using WixToolset.Extensibility; |
| 19 | using WixToolset.Extensibility.Data; | ||
| 19 | using WixToolset.Extensibility.Services; | 20 | using WixToolset.Extensibility.Services; |
| 20 | using WixToolset.Msi; | 21 | using WixToolset.Msi; |
| 21 | 22 | ||
| @@ -324,14 +325,15 @@ namespace WixToolset.Core.WindowsInstaller | |||
| 324 | } | 325 | } |
| 325 | } | 326 | } |
| 326 | 327 | ||
| 327 | public static Validator CreateFromContext(WixToolset.Extensibility.IBindContext context, string cubeFilename) | 328 | public static Validator CreateFromContext(IBindContext context, string cubeFilename) |
| 328 | { | 329 | { |
| 329 | Validator validator = null; | 330 | Validator validator = null; |
| 331 | var messaging = context.ServiceProvider.GetService<IMessaging>(); | ||
| 330 | 332 | ||
| 331 | // Tell the binder about the validator if validation isn't suppressed | 333 | // Tell the binder about the validator if validation isn't suppressed |
| 332 | if (!context.SuppressValidation) | 334 | if (!context.SuppressValidation) |
| 333 | { | 335 | { |
| 334 | validator = new Validator(context.Messaging); | 336 | validator = new Validator(messaging); |
| 335 | validator.IntermediateFolder = Path.Combine(context.IntermediateFolder, "validate"); | 337 | validator.IntermediateFolder = Path.Combine(context.IntermediateFolder, "validate"); |
| 336 | 338 | ||
| 337 | // set the default cube file | 339 | // set the default cube file |
