fix presets expansion (#4024)

gcampbell-msft · web-flow · commit f1a377045e1e · 2024-08-29T16:27:15.000Z
* fix presets expansion

* missed a change

* update changelog
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) {

Original file line number	Diff line number	Diff line change
`@@ -1284,7 +1284,7 @@ export async function expandConfigurePresetVariables(preset: ConfigurePreset, fo`
`1284`	`1284`	`}`
`1285`	`1285`	`}`
`1286`	`1286`
`1287`		`- expansionOpts.envOverride = expandedPreset.environment;`
	`1287`	`+ expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);`
`1288`	`1288`
`1289`	`1289`	`if (preset.__file && preset.__file.version >= 3) {`
`1290`	`1290`	`// 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`
`1659`	`1659`	`}`
`1660`	`1660`	`}`
`1661`	`1661`
`1662`		`- expansionOpts.envOverride = expandedPreset.environment;`
	`1662`	`+ expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);`
`1663`	`1663`
`1664`	`1664`	`// Expand other fields`
`1665`	`1665`	`if (preset.targets) {`
`@@ -1834,7 +1834,7 @@ export async function expandTestPresetVariables(preset: TestPreset, name: string`
`1834`	`1834`	`}`
`1835`	`1835`	`}`
`1836`	`1836`
`1837`		`- expansionOpts.envOverride = expandedPreset.environment;`
	`1837`	`+ expansionOpts.envOverride = EnvironmentUtils.mergePreserveNull([env, expandedPreset.environment]);`
`1838`	`1838`
`1839`	`1839`	`// Expand other fields`
`1840`	`1840`	`if (preset.overwriteConfigurationFile) {`