Ensure environment from settings is added to resolved tasks (#1429)

The environment in the task.json definitions was not adding
workspace/global env settings. Layer in the `swiftEnvironmentVariables`
the same way as in generated build tasks.

Author: plemarquand

src/tasks/SwiftTaskProvider.ts

@@ -439,6 +439,11 @@ export class SwiftTaskProvider implements vscode.TaskProvider {
         const args = platform?.args ?? task.definition.args;
         const env = platform?.env ?? task.definition.env;
         const fullCwd = resolveTaskCwd(task, platform?.cwd ?? task.definition.cwd);
+        const fullEnv = {
+            ...configuration.swiftEnvironmentVariables,
+            ...swiftRuntimeEnv(),
+            ...env,
+        };
 
         const presentation = task.definition.presentation ?? task.presentationOptions ?? {};
         const newTask = new vscode.Task(
@@ -448,7 +453,7 @@ export class SwiftTaskProvider implements vscode.TaskProvider {
             "swift",
             new SwiftExecution(swift, args, {
                 cwd: fullCwd,
-                env: { ...env, ...swiftRuntimeEnv() },
+                env: fullEnv,
                 presentation,
             }),
             task.problemMatchers