diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-22 15:53:01 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-22 15:53:01 -0800 |
| commit | ecf3a0cca5a424a91ab98557d963d2535963d582 (patch) | |
| tree | 06355e906e5c404480dc6eac342b9b4d2ec9d122 /src/WixToolset.Core/Layout.cs | |
| parent | dc9f4c329e6f55ce7595970463e0caf148096f4b (diff) | |
| download | wix-ecf3a0cca5a424a91ab98557d963d2535963d582.tar.gz wix-ecf3a0cca5a424a91ab98557d963d2535963d582.tar.bz2 wix-ecf3a0cca5a424a91ab98557d963d2535963d582.zip | |
Reintroduce binder extensions and light.exe for binding .wixouts
Diffstat (limited to 'src/WixToolset.Core/Layout.cs')
| -rw-r--r-- | src/WixToolset.Core/Layout.cs | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/WixToolset.Core/Layout.cs b/src/WixToolset.Core/Layout.cs index d7322a12..b2957fb9 100644 --- a/src/WixToolset.Core/Layout.cs +++ b/src/WixToolset.Core/Layout.cs | |||
| @@ -9,7 +9,6 @@ namespace WixToolset.Core | |||
| 9 | using WixToolset.Core.Bind; | 9 | using WixToolset.Core.Bind; |
| 10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
| 11 | using WixToolset.Data.Bind; | 11 | using WixToolset.Data.Bind; |
| 12 | using WixToolset.Data.Tuples; | ||
| 13 | using WixToolset.Extensibility; | 12 | using WixToolset.Extensibility; |
| 14 | using WixToolset.Extensibility.Services; | 13 | using WixToolset.Extensibility.Services; |
| 15 | 14 | ||
| @@ -18,36 +17,31 @@ namespace WixToolset.Core | |||
| 18 | /// </summary> | 17 | /// </summary> |
| 19 | public sealed class Layout | 18 | public sealed class Layout |
| 20 | { | 19 | { |
| 21 | public Layout(IServiceProvider serviceProvider, IEnumerable<FileTransfer> fileTransfers, IEnumerable<string> contentFilePaths, string contentsFile, string outputsFile, string builtOutputsFile, bool suppressAclReset) | 20 | public Layout(IServiceProvider serviceProvider) |
| 22 | { | 21 | { |
| 23 | this.ServiceProvider = serviceProvider; | 22 | this.ServiceProvider = serviceProvider; |
| 24 | this.FileTransfers = fileTransfers; | ||
| 25 | this.ContentFilePaths = contentFilePaths; | ||
| 26 | this.ContentsFile = contentsFile; | ||
| 27 | this.OutputsFile = outputsFile; | ||
| 28 | this.BuiltOutputsFile = builtOutputsFile; | ||
| 29 | this.SuppressAclReset = suppressAclReset; | ||
| 30 | this.Messaging = this.ServiceProvider.GetService<IMessaging>(); | ||
| 31 | } | 23 | } |
| 32 | 24 | ||
| 33 | private IServiceProvider ServiceProvider { get; } | 25 | private IServiceProvider ServiceProvider { get; } |
| 34 | 26 | ||
| 35 | private IEnumerable<FileTransfer> FileTransfers { get; } | 27 | public IEnumerable<FileTransfer> FileTransfers { get; set; } |
| 36 | 28 | ||
| 37 | private IEnumerable<string> ContentFilePaths { get; } | 29 | public IEnumerable<string> ContentFilePaths { get; set; } |
| 38 | 30 | ||
| 39 | private string ContentsFile { get; } | 31 | public string ContentsFile { get; set; } |
| 40 | 32 | ||
| 41 | private string OutputsFile { get; } | 33 | public string OutputsFile { get; set; } |
| 42 | 34 | ||
| 43 | private string BuiltOutputsFile { get; } | 35 | public string BuiltOutputsFile { get; set; } |
| 44 | 36 | ||
| 45 | private bool SuppressAclReset { get; } | 37 | public bool SuppressAclReset { get; set; } |
| 46 | 38 | ||
| 47 | private IMessaging Messaging { get; } | 39 | private IMessaging Messaging { get; set; } |
| 48 | 40 | ||
| 49 | public void Execute() | 41 | public void Execute() |
| 50 | { | 42 | { |
| 43 | this.Messaging = this.ServiceProvider.GetService<IMessaging>(); | ||
| 44 | |||
| 51 | var extensionManager = this.ServiceProvider.GetService<IExtensionManager>(); | 45 | var extensionManager = this.ServiceProvider.GetService<IExtensionManager>(); |
| 52 | 46 | ||
| 53 | var context = this.ServiceProvider.GetService<ILayoutContext>(); | 47 | var context = this.ServiceProvider.GetService<ILayoutContext>(); |
