Potential fix for hanging build (#4479)

* Potential fix for build hanging

* Add entry to CHANGELOG

---------

Co-authored-by: pierreluc.robitaille <[email protected]>

Author: PILIX123

CHANGELOG.md

@@ -29,6 +29,7 @@ Bug Fixes:
 - Fix evaluation of conditions in presets. [#4425](https://github.com/microsoft/vscode-cmake-tools/issues/4425)
 - Fix ENOENT error at vscode startup on some circumstances [#2855](https://github.com/microsoft/vscode-cmake-tools/issues/2855) Contributed by STMicroelectronics
 - Fix repeat execution option in test presets [#4443](https://github.com/microsoft/vscode-cmake-tools/issues/4443)
+- Fix bug that makes some build hang [#4424](https://github.com/microsoft/vscode-cmake-tools/issues/4424) and [#4465](https://github.com/microsoft/vscode-cmake-tools/issues/4465)
 
 ## 1.20.53
 

src/cmakeTaskProvider.ts

@@ -257,6 +257,13 @@ export class CMakeTaskProvider implements vscode.TaskProvider {
         // Fetch all CMake task from `tasks.json` files.
         const allTasks: vscode.Task[] = await vscode.tasks.fetchTasks({ type: CMakeTaskProvider.CMakeScriptType });
 
+        // Fetch CMake task from from task provider
+        const workspaceFolderObj: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(workspaceFolder));
+        if (!workspaceFolderObj) {
+            log.error(localize("workspace.folder.not.found", 'Workspace folder not found.'));
+            return undefined;
+        }
+
         const tasks: (CMakeTask | undefined)[] = await Promise.all(allTasks.map(async (task: any) => {
             if (!task.definition.label || !task.group || (task.group && task.group.id !== vscode.TaskGroup.Build.id)) {
                 return undefined;
@@ -281,7 +288,7 @@ export class CMakeTaskProvider implements vscode.TaskProvider {
                 options: task.definition.options
             };
 
-            const buildTask: CMakeTask = new vscode.Task(definition, vscode.TaskScope.Workspace, task.definition.label, CMakeTaskProvider.CMakeSourceStr);
+            const buildTask: CMakeTask = new vscode.Task(definition, workspaceFolderObj, task.definition.label, CMakeTaskProvider.CMakeSourceStr);
             buildTask.detail = task.detail;
             if (task.group.isDefault) {
                 buildTask.isDefault = true;
@@ -331,12 +338,6 @@ export class CMakeTaskProvider implements vscode.TaskProvider {
             }
         }
 
-        // Fetch CMake task from from task provider
-        const workspaceFolderObj: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(workspaceFolder));
-        if (!workspaceFolderObj) {
-            log.error(localize("workspace.folder.not.found", 'Workspace folder not found.'));
-            return undefined;
-        }
         matchingTargetTasks.push(await CMakeTaskProvider.provideTask(CommandType.build, workspaceFolderObj, undefined, targets, presetName));
         const items: TaskMenu[] = matchingTargetTasks.map<TaskMenu>(task => ({ label: task.name, task: task, description: task.detail }));
         // Ask the user to pick a task.