Support harvesting dependency providers from v3 and v4 MSIs.
Sean Hall committed
Jan 21, 2022 at 12:41 UTC
cab989dad7b3cc5006d6684ed9d5733db337020f
1 file changed
+8
-2
src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+8
-2
@@ -488,9 +488,15 @@ namespace WixToolset.Core.Burn.Bundles
488
489
private void ImportDependencyProviders(Database db, WixBundleMsiPackageSymbol msiPackage)
490
{
491
- if (db.TableExists("Wix4DependencyProvider"))
491
+ this.ImportDependencyProvidersFromTable(db, msiPackage, "WixDependencyProvider");
492
+ this.ImportDependencyProvidersFromTable(db, msiPackage, "Wix4DependencyProvider");
493
+ }
494
+
495
+ private void ImportDependencyProvidersFromTable(Database db, WixBundleMsiPackageSymbol msiPackage, string tableName)
496
+ {
497
+ if (db.TableExists(tableName))
498
{
493
- using (var view = db.OpenExecuteView("SELECT `WixDependencyProvider`, `ProviderKey`, `Version`, `DisplayName`, `Attributes` FROM `Wix4DependencyProvider`"))
499
+ using (var view = db.OpenExecuteView($"SELECT `WixDependencyProvider`, `ProviderKey`, `Version`, `DisplayName`, `Attributes` FROM `{tableName}`"))
500
{
501
foreach (var record in view.Records)
502
{