Merge pull request #1391 from arturcic/fix/1389

#1389 - fix setting the build version in azure devops

Author: arturcic

dist/tools/azure/agent.mjs

@@ -80,6 +80,11 @@ class BuildAgent extends BuildAgentBase {
   setFailed = (message, done) => this._setResult(TaskResult.Failed, message, done);
   setOutput = (name, value) => this._setVariable(name, value, true);
   setVariable = (name, value) => this._setVariable(name, value);
+  updateBuildNumber = (version) => this._updateBuildNumber(version);
+  _updateBuildNumber(version) {
+    this.debug(`build number: ${version}`);
+    issueCommand("build.updatebuildnumber", {}, version);
+  }
   _setResult(result, message, done) {
     this.debug(`task result: ${TaskResult[result]}`);
     if (result === TaskResult.Failed && message) {

dist/tools/azure/agent.mjs.map

@@ -132,6 +132,7 @@ class BuildAgent extends BuildAgentBase {
     }
     issueCommand("set-env", { name }, convertedVal);
   };
+  updateBuildNumber = (version) => this.debug(`updateBuildNumber - ${version}`);
 }
 
 export { BuildAgent };

dist/tools/github/agent.mjs

@@ -88,6 +88,10 @@ class GitVersionTool extends DotnetTool {
         this.buildAgent.error(`Unable to set output/variable for ${property}`);
       }
     }
+    if (output.FullSemVer.endsWith("+0")) {
+      output.FullSemVer = output.FullSemVer.slice(0, -2);
+    }
+    this.buildAgent.updateBuildNumber(output.FullSemVer);
   }
   async getRepoDir(settings) {
     return await super.getRepoPath(settings.targetPath);

dist/tools/github/agent.mjs.map

@@ -25,6 +25,7 @@ class BuildAgent extends BuildAgentBase {
     this.debug(`setVariable - ${name} - ${value}`);
     process.env[name] = value;
   }
+  updateBuildNumber = (version) => this.debug(`updateBuildNumber - ${version}`);
 }
 
 export { BuildAgent };

dist/tools/libs/agents.mjs.map

@@ -119,4 +119,14 @@ describe.skipIf(isAzurePipelines)('build-agent/azure', () => {
         expect(spy).toHaveBeenCalledTimes(1)
         expect(spy).toHaveBeenCalledWith(`##vso[task.setvariable variable=test;isOutput=true;issecret=false;]value${os.EOL}`)
     })
+
+    it('should update build number', () => {
+        const spyDebug = vi.spyOn(agent, 'debug')
+        const spyWrite = vi.spyOn(process.stdout, 'write')
+
+        agent.updateBuildNumber('test')
+        expect(spyDebug).toHaveBeenCalledTimes(1)
+        expect(spyDebug).toHaveBeenCalledWith('build number: test')
+        expect(spyWrite).toHaveBeenCalledWith(`##vso[build.updatebuildnumber]test${os.EOL}`)
+    })
 })