Fix dotnetCoreCliV2 run command (#10753)

* Fix dotnetCoreCliV2 run command * Taking into account scenario when project files are not specified and meant to run command in CWD
microsoft · Jun 27, 2019 · 45a505a · 45a505a
1 parent f59d575
commit 45a505a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Tasks/DotNetCoreCLIV2/dotnetcore.ts b/Tasks/DotNetCoreCLIV2/dotnetcore.ts
@@ -87,7 +87,14 @@ export class dotNetExe {
             var projectFile = projectFiles[fileIndex];
             var dotnet = tl.tool(dotnetPath);
             dotnet.arg(this.command);
-            dotnet.arg(projectFile);
+            if (this.isRunCommand()) {
+                if (!!projectFile) {
+                    dotnet.arg("--project");
+                    dotnet.arg(projectFile);
+                }
+            } else {
+                dotnet.arg(projectFile);
+            }
             var dotnetArguments = this.arguments;
             if (this.isPublishCommand() && this.outputArgument && tl.getBoolInput("modifyOutputPath")) {
                 var output = dotNetExe.getModifiedOutputForProjectFile(this.outputArgument, projectFile);
@@ -345,6 +352,10 @@ export class dotNetExe {
         return this.command === "publish";
     }
 
+    private isRunCommand(): boolean {
+        return this.command === "run";
+    }
+
     private static getModifiedOutputForProjectFile(outputBase: string, projectFile: string): string {
         return path.join(outputBase, path.basename(path.dirname(projectFile)));
     }

diff --git a/Tasks/DotNetCoreCLIV2/task.json b/Tasks/DotNetCoreCLIV2/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 154,
-        "Patch": 5
+        "Patch": 6
     },
     "minimumAgentVersion": "2.115.0",
     "instanceNameFormat": "dotnet $(command)",

diff --git a/Tasks/DotNetCoreCLIV2/task.loc.json b/Tasks/DotNetCoreCLIV2/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 2,
     "Minor": 154,
-    "Patch": 5
+    "Patch": 6
   },
   "minimumAgentVersion": "2.115.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",