From cab989dad7b3cc5006d6684ed9d5733db337020f Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 21 Jan 2022 12:41:01 -0600
Subject: Support harvesting dependency providers from v3 and v4 MSIs.
---
.../WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index b1477c5a..1239b9b5 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -488,9 +488,15 @@ namespace WixToolset.Core.Burn.Bundles
private void ImportDependencyProviders(Database db, WixBundleMsiPackageSymbol msiPackage)
{
- if (db.TableExists("Wix4DependencyProvider"))
+ this.ImportDependencyProvidersFromTable(db, msiPackage, "WixDependencyProvider");
+ this.ImportDependencyProvidersFromTable(db, msiPackage, "Wix4DependencyProvider");
+ }
+
+ private void ImportDependencyProvidersFromTable(Database db, WixBundleMsiPackageSymbol msiPackage, string tableName)
+ {
+ if (db.TableExists(tableName))
{
- using (var view = db.OpenExecuteView("SELECT `WixDependencyProvider`, `ProviderKey`, `Version`, `DisplayName`, `Attributes` FROM `Wix4DependencyProvider`"))
+ using (var view = db.OpenExecuteView($"SELECT `WixDependencyProvider`, `ProviderKey`, `Version`, `DisplayName`, `Attributes` FROM `{tableName}`"))
{
foreach (var record in view.Records)
{
--
cgit v1.2.3-55-g6feb