DotNetCore command supports custom commands

Tasks/DotNetCoreCLI/Tests/L0.ts

@@ -506,4 +506,72 @@ describe('DotNetCoreExe Suite', function () {
         assert.equal(tr.errorIssues.length, 0, 'should have no errors');
         done();
     });
+
+    it('custom command fails when no project match found', (done: MochaDone) => {
+        process.env["__command__"] = "custom";
+        process.env["__custom__"] = "test";
+        process.env["__projects__"] = "*nomatch*/project.json";
+
+        let tp = path.join(__dirname, 'customInputs.js')
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+        tr.run();
+
+        assert(tr.invokedToolCount == 0, 'should not have invoked tool');
+        assert(tr.failed, 'task should have failed');
+        assert.equal(tr.errorIssues.length, 1, "should have thrown an error");
+        done();
+    });
+
+    it('custom command executes without projects if none supplied', (done: MochaDone) => {
+        process.env["__command__"] = "custom";
+        process.env["__custom__"] = "vstest";
+        process.env["__projects__"] = "";
+        process.env["__arguments__"] = "supplied/in/arguments.dll --framework netcoreapp2.0"
+
+        let tp = path.join(__dirname, 'customInputs.js')
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+        tr.run();
+
+        assert(tr.invokedToolCount == 1, 'should have invoked tool');
+        assert(tr.ran('c:\\path\\dotnet.exe vstest supplied/in/arguments.dll --framework netcoreapp2.0'), 'it should have run dotnet with expected arguments');
+        assert(tr.stdOutContained('vstest succeeded'), "should have dotnet output");
+        assert(tr.succeeded, 'should have succeeded');
+        assert.equal(tr.errorIssues.length, 0, "should have no errors");
+        done();
+    });
+
+    it('custom command fails if dotnet returns error', (done: MochaDone) => {
+        process.env["__command__"] = "custom";
+        process.env["__custom__"] = "test";
+        process.env["__projects__"] = "fails/project.json";
+        process.env["__arguments__"] = "--no-build --no-restore"
+
+        let tp = path.join(__dirname, 'customInputs.js')
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+        tr.run();
+
+        assert(tr.invokedToolCount == 1, 'should have invoked tool');
+        assert(tr.ran('c:\\path\\dotnet.exe test fails/project.json --no-build --no-restore'), 'it should have run dotnet with expected arguments');
+        assert(tr.stdOutContained('test failed'), "should have dotnet output");
+        assert(tr.failed, 'task should have failed');
+        assert(tr.errorIssues.length > 0, "error reason should have been recorded");
+        done();
+    });
+
+    it('custom command runs once for each matched project', (done: MochaDone) => {
+        process.env["__command__"] = "custom";
+        process.env["__custom__"] = "test";
+        process.env["__projects__"] = "**/project.json";
+        process.env["__arguments__"] = ""
+
+        let tp = path.join(__dirname, 'customInputs.js')
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+        tr.run();
+
+        assert(tr.invokedToolCount == 4, 'should not have invoked tool 4 times');
+        assert(tr.succeeded, 'task should have succeeded');
+        assert.equal(tr.errorIssues.length, 0, "should have no errors");
+        done();
+    });
+
 });

Tasks/DotNetCoreCLI/Tests/customInputs.ts

@@ -0,0 +1,61 @@
+import ma = require('vsts-task-lib/mock-answer');
+import tmrm = require('vsts-task-lib/mock-run');
+import path = require('path');
+
+let taskPath = path.join(__dirname, '..', 'dotnetcore.js');
+let tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
+
+tmr.setInput('command', "custom");
+tmr.setInput('custom', process.env["__custom__"]);
+tmr.setInput('projects', process.env["__projects__"]);
+tmr.setInput('arguments', process.env["__arguments__"] ? process.env["__arguments__"] : "");
+
+let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
+    "which": { "dotnet": "c:\\path\\dotnet.exe" },
+    "checkPath": { "c:\\path\\dotnet.exe": true },
+    "exec": {
+        "c:\\path\\dotnet.exe test web/project.json": {
+            "code": 0,
+            "stdout": "test succeeded",
+            "stderr": ""
+        },
+        "c:\\path\\dotnet.exe test web2/project.json": {
+            "code": 0,
+            "stdout": "test succeeded",
+            "stderr": ""
+        },
+        "c:\\path\\dotnet.exe test web.tests/project.json": {
+            "code": 0,
+            "stdout": "test succeeded",
+            "stderr": ""
+        },
+        "c:\\path\\dotnet.exe test lib/project.json": {
+            "code": 0,
+            "stdout": "test succeeded",
+            "stderr": ""
+        },
+        "c:\\path\\dotnet.exe test fails/project.json --no-build --no-restore": {
+            "code": 1,
+            "stdout": "test failed",
+            "stderr": ""
+        },
+        "c:\\path\\dotnet.exe vstest supplied/in/arguments.dll --framework netcoreapp2.0": {
+            "code": 0,
+            "stdout": "vstest succeeded",
+            "stderr": ""
+        }
+    },
+    "findMatch": {
+        "**/project.json": ["web/project.json", "web2/project.json", "web.tests/project.json", "lib/project.json"],
+        "**/project.json;**/*.csproj;**/*.vbproj": ["web/project.json", "web2/project.json", "web.tests/project.json", "lib/project.json"],
+        "*nomatch*/project.json": [],
+        "fails/project.json": ["fails/project.json"],
+        "withArguments/project.json": ["withArguments/project.json"],
+        "" : []
+    }
+};
+
+tmr.setAnswers(a);
+tmr.registerMock('vsts-task-lib/toolrunner', require('vsts-task-lib/mock-toolrunner'));
+
+tmr.run();

Tasks/DotNetCoreCLI/dotnetcore.ts

@@ -30,16 +30,17 @@ export class dotNetExe {
 
     public async execute() {
         tl.setResourcePath(path.join(__dirname, "task.json"));
-        if (this.command === "custom") {
-            this.command = tl.getInput("custom", true);
-        }
 
         switch (this.command) {
             case "build":
             case "publish":
             case "run":
                 await this.executeBasicCommand();
                 break;
+            case "custom":
+                this.command = tl.getInput("custom", true);
+                await this.executeBasicCommand();
+                break;
             case "test":
                 await this.executeTestCommand();
                 break;

Tasks/DotNetCoreCLI/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vsts-tasks-dotnetcoreexe",
-    "version": "2.1.5",
+    "version": "2.129.4",
     "description": "Dotnet core exe",
     "main": "dotnetcore.js",
     "scripts": {
@@ -23,4 +23,4 @@
         "vso-node-api": "6.0.1-preview",
         "vsts-task-lib": "2.0.6"
     }
-}
+}

Tasks/DotNetCoreCLI/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 129,
-        "Patch": 3
+        "Patch": 4
     },
     "minimumAgentVersion": "2.0.0",
     "instanceNameFormat": "dotnet $(command)",

Tasks/DotNetCoreCLI/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 129,
-    "Patch": 3
+    "Patch": 4
   },
   "minimumAgentVersion": "2.0.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",