Expand variables in options.env section of tasks.json (#10208)

emilhammarstedtst · web-flow · commit 3453800243a4 · 2021-11-25T13:23:36.000-05:00
Fixes #10207 Contributed by STMicroelectronics Signed-off-by: Emil HAMMARSTEDT <emil.hammarstedt@st.com>
diff --git a/packages/task/src/browser/process/process-task-resolver.ts b/packages/task/src/browser/process/process-task-resolver.ts
@@ -80,7 +80,7 @@ export class ProcessTaskResolver implements TaskResolver {
             } : undefined,
             options: {
                 cwd: await this.variableResolverService.resolve(cwd, variableResolverOptions),
-                env: processTaskConfig.options && processTaskConfig.options.env,
+                env: processTaskConfig.options?.env && await this.variableResolverService.resolve(processTaskConfig.options.env, variableResolverOptions),
                 shell: processTaskConfig.options && processTaskConfig.options.shell
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export class ProcessTaskResolver implements TaskResolver {`
`80`	`80`	`} : undefined,`
`81`	`81`	`options: {`
`82`	`82`	`cwd: await this.variableResolverService.resolve(cwd, variableResolverOptions),`
`83`		`- env: processTaskConfig.options && processTaskConfig.options.env,`
	`83`	`+ env: processTaskConfig.options?.env && await this.variableResolverService.resolve(processTaskConfig.options.env, variableResolverOptions),`
`84`	`84`	`shell: processTaskConfig.options && processTaskConfig.options.shell`
`85`	`85`	`}`
`86`	`86`	`};`