diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-07 14:19:05 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-07 14:19:05 -0800 |
| commit | 49f1209035aac1fcfad5dbbe25f7b2306d3be86c (patch) | |
| tree | 6ce5921493eb751b6d89c3faf0ebdf64110cbb65 /src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs | |
| parent | b1e662bd480241ea914f0f3d6bd174d9ffd03f5f (diff) | |
| download | wix-49f1209035aac1fcfad5dbbe25f7b2306d3be86c.tar.gz wix-49f1209035aac1fcfad5dbbe25f7b2306d3be86c.tar.bz2 wix-49f1209035aac1fcfad5dbbe25f7b2306d3be86c.zip | |
Support MSI backends creating custom tables and remove WixToolset.Data.WindowsInstaller
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs index 58384325..5c56d9aa 100644 --- a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs | |||
| @@ -9,7 +9,9 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe | |||
| 9 | using System.Runtime.InteropServices; | 9 | using System.Runtime.InteropServices; |
| 10 | using System.Security.Cryptography.X509Certificates; | 10 | using System.Security.Cryptography.X509Certificates; |
| 11 | using WixToolset.Core.Native; | 11 | using WixToolset.Core.Native; |
| 12 | using WixToolset.Core.WindowsInstaller.Bind; | ||
| 12 | using WixToolset.Data; | 13 | using WixToolset.Data; |
| 14 | using WixToolset.Data.WindowsInstaller; | ||
| 13 | using WixToolset.Extensibility; | 15 | using WixToolset.Extensibility; |
| 14 | using WixToolset.Msi; | 16 | using WixToolset.Msi; |
| 15 | 17 | ||
| @@ -250,13 +252,19 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe | |||
| 250 | 252 | ||
| 251 | if (digitalCertificateTable.Rows.Count > 0) | 253 | if (digitalCertificateTable.Rows.Count > 0) |
| 252 | { | 254 | { |
| 253 | database.ImportTable(codepage, digitalCertificateTable, this.Context.IntermediateFolder, true); | 255 | var command = new CreateIdtFileCommand(digitalCertificateTable, codepage, this.Context.IntermediateFolder, true); |
| 256 | command.Execute(); | ||
| 257 | |||
| 258 | database.Import(command.IdtPath); | ||
| 254 | shouldCommit = true; | 259 | shouldCommit = true; |
| 255 | } | 260 | } |
| 256 | 261 | ||
| 257 | if (digitalSignatureTable.Rows.Count > 0) | 262 | if (digitalSignatureTable.Rows.Count > 0) |
| 258 | { | 263 | { |
| 259 | database.ImportTable(codepage, digitalSignatureTable, this.Context.IntermediateFolder, true); | 264 | var command = new CreateIdtFileCommand(digitalSignatureTable, codepage, this.Context.IntermediateFolder, true); |
| 265 | command.Execute(); | ||
| 266 | |||
| 267 | database.Import(command.IdtPath); | ||
| 260 | shouldCommit = true; | 268 | shouldCommit = true; |
| 261 | } | 269 | } |
| 262 | 270 | ||
