fix presets expansion (#4024)

* fix presets expansion * missed a change * update changelog
microsoft · Aug 29, 2024 · f1a3770 · f1a3770
1 parent 96f67f1
commit f1a3770
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # What's New?
 
-## 1.19
+## 1.19.50
+
+Bug Fixes: 
+
+- Fix env expansion of all variables (toolchainFile, etc.) in presets. [#4019](https://github.com/microsoft/vscode-cmake-tools/issues/4019)
+
+## 1.19.49
 
 Features:
 

diff --git a/src/preset.ts b/src/preset.ts
@@ -1284,7 +1284,7 @@ export async function expandConfigurePresetVariables(preset: ConfigurePreset, fo
         }
     }
 
-    expansionOpts.envOverride = expandedPreset.environment;
+    expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);
 
     if (preset.__file && preset.__file.version >= 3) {
         // For presets v3+ binaryDir is optional, but cmake-tools needs a value. Default to something reasonable.
@@ -1659,7 +1659,7 @@ export async function expandBuildPresetVariables(preset: BuildPreset, name: stri
         }
     }
 
-    expansionOpts.envOverride = expandedPreset.environment;
+    expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);
 
     // Expand other fields
     if (preset.targets) {
@@ -1834,7 +1834,7 @@ export async function expandTestPresetVariables(preset: TestPreset, name: string
         }
     }
 
-    expansionOpts.envOverride = expandedPreset.environment;
+    expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);
 
     // Expand other fields
     if (preset.overwriteConfigurationFile) {