aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Inscribe
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-14 07:38:48 -0700
committerRob Mensching <rob@firegiant.com>2021-03-14 07:47:48 -0700
commit3ccd5e439da4296d6f2b66ce47075ab20d039676 (patch)
treeb5546552613b869367d09f444492a0bbcfadcfe0 /src/WixToolset.Core.WindowsInstaller/Inscribe
parent574785ab1421c9b67336c13ade5c2263e665ca07 (diff)
downloadwix-3ccd5e439da4296d6f2b66ce47075ab20d039676.tar.gz
wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.tar.bz2
wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.zip
Minimize public surface area of Core
Fixes wixtoolset/issues#6374
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Inscribe')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
index 256d3476..19869cfa 100644
--- a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
@@ -21,6 +21,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
21 { 21 {
22 this.Context = context; 22 this.Context = context;
23 this.Messaging = context.ServiceProvider.GetService<IMessaging>(); 23 this.Messaging = context.ServiceProvider.GetService<IMessaging>();
24 this.WindowsInstallerBackendHelper = context.ServiceProvider.GetService<IWindowsInstallerBackendHelper>();
24 this.TableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All); 25 this.TableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All);
25 } 26 }
26 27
@@ -28,6 +29,8 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
28 29
29 private IMessaging Messaging { get; } 30 private IMessaging Messaging { get; }
30 31
32 private IWindowsInstallerBackendHelper WindowsInstallerBackendHelper { get; }
33
31 private TableDefinitionCollection TableDefinitions { get; } 34 private TableDefinitionCollection TableDefinitions { get; }
32 35
33 public bool Execute() 36 public bool Execute()
@@ -197,7 +200,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
197 if (!certificates.ContainsKey(cert2.Thumbprint)) 200 if (!certificates.ContainsKey(cert2.Thumbprint))
198 { 201 {
199 // generate a stable identifier 202 // generate a stable identifier
200 var certificateGeneratedId = Common.GenerateIdentifier("cer", cert2.Thumbprint); 203 var certificateGeneratedId = this.WindowsInstallerBackendHelper.GenerateIdentifier("cer", cert2.Thumbprint);
201 204
202 // Add it to our "add to MsiDigitalCertificate" table dictionary 205 // Add it to our "add to MsiDigitalCertificate" table dictionary
203 var digitalCertificateRow = digitalCertificateTable.CreateRow(null); 206 var digitalCertificateRow = digitalCertificateTable.CreateRow(null);