diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-01-03 15:05:31 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-01-03 15:05:31 -0800 |
| commit | bfd280115ae55bf0e63f5a787c0ab3a3cf8efa32 (patch) | |
| tree | f176e05e6f7b50ccd29382b09849c276ec816df2 /src/WixToolset.Core.WindowsInstaller/Bind | |
| parent | b75681cadcfa4347a98e4815154d6c2d311da62a (diff) | |
| download | wix-bfd280115ae55bf0e63f5a787c0ab3a3cf8efa32.tar.gz wix-bfd280115ae55bf0e63f5a787c0ab3a3cf8efa32.tar.bz2 wix-bfd280115ae55bf0e63f5a787c0ab3a3cf8efa32.zip | |
Update Extensiblity for update to IWindowsInstallerBackendExtension.PostBackendBind()
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 205feeac..2e4b4827 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
| @@ -36,7 +36,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 36 | this.Intermediate = context.IntermediateRepresentation; | 36 | this.Intermediate = context.IntermediateRepresentation; |
| 37 | this.Messaging = context.Messaging; | 37 | this.Messaging = context.Messaging; |
| 38 | this.OutputPath = context.OutputPath; | 38 | this.OutputPath = context.OutputPath; |
| 39 | this.PdbFile = context.OutputPdbPath; | ||
| 40 | this.IntermediateFolder = context.IntermediateFolder; | 39 | this.IntermediateFolder = context.IntermediateFolder; |
| 41 | this.Validator = validator; | 40 | this.Validator = validator; |
| 42 | 41 | ||
| @@ -61,8 +60,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 61 | 60 | ||
| 62 | private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; } | 61 | private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; } |
| 63 | 62 | ||
| 64 | private string PdbFile { get; } | ||
| 65 | |||
| 66 | private Intermediate Intermediate { get; } | 63 | private Intermediate Intermediate { get; } |
| 67 | 64 | ||
| 68 | private IMessaging Messaging { get; } | 65 | private IMessaging Messaging { get; } |
| @@ -84,6 +81,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 84 | 81 | ||
| 85 | public IEnumerable<string> ContentFilePaths { get; private set; } | 82 | public IEnumerable<string> ContentFilePaths { get; private set; } |
| 86 | 83 | ||
| 84 | public Pdb Pdb { get; private set; } | ||
| 85 | |||
| 87 | public void Execute() | 86 | public void Execute() |
| 88 | { | 87 | { |
| 89 | var section = this.Intermediate.Sections.Single(); | 88 | var section = this.Intermediate.Sections.Single(); |
| @@ -428,14 +427,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 428 | return; | 427 | return; |
| 429 | } | 428 | } |
| 430 | 429 | ||
| 431 | // Output the output to a file. | ||
| 432 | if (!String.IsNullOrEmpty(this.PdbFile)) | ||
| 433 | { | ||
| 434 | Pdb pdb = new Pdb(); | ||
| 435 | pdb.Output = output; | ||
| 436 | pdb.Save(this.PdbFile); | ||
| 437 | } | ||
| 438 | |||
| 439 | // Merge modules. | 430 | // Merge modules. |
| 440 | if (containsMergeModules) | 431 | if (containsMergeModules) |
| 441 | { | 432 | { |
| @@ -514,6 +505,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 514 | 505 | ||
| 515 | this.FileTransfers = fileTransfers; | 506 | this.FileTransfers = fileTransfers; |
| 516 | this.ContentFilePaths = fileFacades.Select(r => r.WixFile.Source.Path).ToList(); | 507 | this.ContentFilePaths = fileFacades.Select(r => r.WixFile.Source.Path).ToList(); |
| 508 | this.Pdb = new Pdb { Output = output }; | ||
| 517 | 509 | ||
| 518 | // TODO: Eventually this gets removed | 510 | // TODO: Eventually this gets removed |
| 519 | var intermediate = new Intermediate(this.Intermediate.Id, new[] { section }, this.Intermediate.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase), this.Intermediate.EmbedFilePaths); | 511 | var intermediate = new Intermediate(this.Intermediate.Id, new[] { section }, this.Intermediate.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase), this.Intermediate.EmbedFilePaths); |
