Merge pull request #1686 from arturcic/fix/1679

Ensures GitVersion output is valid

Author: arturcic

dist/tools/libs/gitversion.mjs

@@ -210,21 +210,25 @@ class Runner extends RunnerBase {
     return this.safeExecute(async () => await this.tool.executeCommand(), "GitVersion executed successfully");
   }
   processGitVersionOutput(result) {
-    const stdout = result.stdout;
-    if (stdout.lastIndexOf("{") === -1 || stdout.lastIndexOf("}") === -1) {
-      const errorMessage = "GitVersion output is not valid JSON, see output details";
-      this.buildAgent.debug(errorMessage);
-      this.buildAgent.setFailed(errorMessage, true);
-      return {
-        code: -1,
-        error: new Error(errorMessage)
-      };
+    if (result.code === 0) {
+      const stdout = result.stdout;
+      if (stdout.lastIndexOf("{") === -1 || stdout.lastIndexOf("}") === -1) {
+        const errorMessage = "GitVersion output is not valid JSON, see output details";
+        this.buildAgent.debug(errorMessage);
+        this.buildAgent.setFailed(errorMessage, true);
+        return {
+          code: -1,
+          error: new Error(errorMessage)
+        };
+      } else {
+        const jsonOutput = stdout.substring(stdout.lastIndexOf("{"), stdout.lastIndexOf("}") + 1);
+        const gitVersionOutput = JSON.parse(jsonOutput);
+        this.tool.writeGitVersionToAgent(gitVersionOutput);
+        this.tool.updateBuildNumber();
+        this.buildAgent.setSucceeded("GitVersion executed successfully", true);
+        return result;
+      }
     } else {
-      const jsonOutput = stdout.substring(stdout.lastIndexOf("{"), stdout.lastIndexOf("}") + 1);
-      const gitVersionOutput = JSON.parse(jsonOutput);
-      this.tool.writeGitVersionToAgent(gitVersionOutput);
-      this.tool.updateBuildNumber();
-      this.buildAgent.setSucceeded("GitVersion executed successfully", true);
       return result;
     }
   }