diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-02-20 19:18:23 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2026-02-20 19:18:23 -0500 |
| commit | 8f3c366e9671dc5d4931dd3de28a42a1f1be32a5 (patch) | |
| tree | b9f270a14fe73dc07667cf37ea0232662e7d858b /src/burn/engine/core.cpp | |
| parent | 96222b03ccc510027cb4d506fb424961cc351e03 (diff) | |
| download | wix-8f3c366e9671dc5d4931dd3de28a42a1f1be32a5.tar.gz wix-8f3c366e9671dc5d4931dd3de28a42a1f1be32a5.tar.bz2 wix-8f3c366e9671dc5d4931dd3de28a42a1f1be32a5.zip | |
Configurable-scope bundles for WixStdBA.bob/WixStdBaConfigurableScope
Fixes https://github.com/wixtoolset/issues/issues/9234
Fixes https://github.com/wixtoolset/issues/issues/9235
Diffstat (limited to 'src/burn/engine/core.cpp')
| -rw-r--r-- | src/burn/engine/core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 5483e46f..da4ea91b 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -453,7 +453,7 @@ extern "C" HRESULT CorePlan( | |||
| 453 | pEngineState->fPlanned = FALSE; | 453 | pEngineState->fPlanned = FALSE; |
| 454 | PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); | 454 | PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads); |
| 455 | 455 | ||
| 456 | hr = PlanSetVariables(action, pEngineState->registration.scope, pEngineState->plan.plannedScope, &pEngineState->variables); | 456 | hr = PlanSetVariables(action, pEngineState->plan.plannedScope, &pEngineState->variables); |
| 457 | ExitOnFailure(hr, "Failed to update plan variables."); | 457 | ExitOnFailure(hr, "Failed to update plan variables."); |
| 458 | 458 | ||
| 459 | // Remember the overall action state in the plan since it shapes the changes | 459 | // Remember the overall action state in the plan since it shapes the changes |
| @@ -569,7 +569,7 @@ extern "C" HRESULT CorePlan( | |||
| 569 | LogPackages(pUpgradeBundlePackage, pForwardCompatibleBundlePackage, &pEngineState->packages, &pEngineState->registration.relatedBundles, action); | 569 | LogPackages(pUpgradeBundlePackage, pForwardCompatibleBundlePackage, &pEngineState->packages, &pEngineState->registration.relatedBundles, action); |
| 570 | } | 570 | } |
| 571 | 571 | ||
| 572 | hr = PlanSetVariables(action, pEngineState->registration.scope, pEngineState->plan.plannedScope, &pEngineState->variables); | 572 | hr = PlanSetVariables(action, pEngineState->plan.plannedScope, &pEngineState->variables); |
| 573 | ExitOnFailure(hr, "Failed to update plan variables after planning."); | 573 | ExitOnFailure(hr, "Failed to update plan variables after planning."); |
| 574 | 574 | ||
| 575 | PlanDump(&pEngineState->plan); | 575 | PlanDump(&pEngineState->plan); |
