Allow variable substitution in Dapr tasks.

Signed-off-by: Phillip Hoff <[email protected]>
microsoft · May 29, 2024 · 2ac30a7 · 2ac30a7
1 parent 321742f
commit 2ac30a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/commands/scaffoldDaprTasks.ts b/src/commands/scaffoldDaprTasks.ts
@@ -146,7 +146,7 @@ export async function scaffoldDaprTasks(context: IActionContext, scaffolder: Sca
 
     const runFilePath = path.join(folder.uri.fsPath, 'dapr.yaml');
 
-    const runFilePathString = '$(workspaceFolder)/dapr.yaml';
+    const runFilePathString = '${workspaceFolder}/dapr.yaml';
     const daprTaskType = 'dapr';
     const daprConfigType = 'dapr';
 

diff --git a/src/tasks/customExecutionTaskProvider.ts b/src/tasks/customExecutionTaskProvider.ts
@@ -31,8 +31,8 @@ export default class CustomExecutionTaskProvider implements vscode.TaskProvider
             task.name,
             task.source,
             new vscode.CustomExecution(
-                () => Promise.resolve(
-                    new TaskPseudoterminal((writer, token) => this.callback(task.definition, writer, token)))),
+                resolvedDefinition => Promise.resolve(
+                    new TaskPseudoterminal((writer, token) => this.callback(resolvedDefinition, writer, token)))),
             problemMatchers);
 
         resolvedTask.isBackground = this.isBackgroundTask !== undefined ? this.isBackgroundTask : task.isBackground;