diff --git a/dist/github/execute/index.js b/dist/github/execute/index.js index 1d60f21..6528c0b 100644 --- a/dist/github/execute/index.js +++ b/dist/github/execute/index.js @@ -7686,7 +7686,8 @@ function run() { try { const inputOptions = getGitVersionOptions(); const result = yield gitVersionTool.run(inputOptions); - console.log(result.stdout); + const gitversion = JSON.parse(result.stdout); + console.log(gitversion.FullSemVer); if (result.code === 0) { buildAgent.setSucceeded("GitVersion executed successfully", true); } @@ -7719,7 +7720,7 @@ function getGitVersionOptions() { }; } run(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImZpbGU6Ly8vRDovUHJvamVjdHMvT1NTL0dpdFRvb2xzL3VzZS1naXR2ZXJzaW9uL3NyYy9naXRodWIvZXhlY3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLDRCQUEwQjtBQUcxQixvQ0FBNkM7QUFDN0MsK0JBQTRCO0FBRTVCLE1BQU0sY0FBYyxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWtCLGFBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN2RSxNQUFNLFVBQVUsR0FBRyxTQUFHLENBQUMsR0FBRyxDQUFjLGFBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUUzRCxTQUFzQixHQUFHOztRQUNyQixJQUFJO1lBQ0EsTUFBTSxZQUFZLEdBQXVCLG9CQUFvQixFQUFFLENBQUM7WUFFaEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxjQUFjLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQ3RELE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRTNCLElBQUksTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLEVBQUU7Z0JBQ25CLFVBQVUsQ0FBQyxZQUFZLENBQUMsa0NBQWtDLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDckU7aUJBQU07Z0JBQ0gsVUFBVSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQzthQUNwRDtTQUVKO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDWixVQUFVLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztTQUNyQztJQUNMLENBQUM7Q0FBQTtBQWhCRCxrQkFnQkM7QUFFRCxTQUFTLG9CQUFvQjtJQUV6QixNQUFNLFVBQVUsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLGtCQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFOUQsTUFBTSxhQUFhLEdBQUcsVUFBVSxDQUFDLGVBQWUsQ0FBQyxrQkFBVSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzNFLE1BQU0sY0FBYyxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsa0JBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUV0RSxNQUFNLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsa0JBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sMEJBQTBCLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLDBCQUEwQixDQUFDLENBQUM7SUFFOUYsTUFBTSxtQkFBbUIsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLGtCQUFVLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUVoRixNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztJQUU3RCxPQUFPO1FBQ0gsVUFBVTtRQUNWLGFBQWE7UUFDYixjQUFjO1FBQ2Qsa0JBQWtCO1FBQ2xCLDBCQUEwQjtRQUMxQixtQkFBbUI7UUFDbkIsTUFBTTtLQUNULENBQUM7QUFDTixDQUFDO0FBRUQsR0FBRyxFQUFFLENBQUMifQ== +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImZpbGU6Ly8vRDovUHJvamVjdHMvT1NTL0dpdFRvb2xzL3VzZS1naXR2ZXJzaW9uL3NyYy9naXRodWIvZXhlY3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLDRCQUEwQjtBQUcxQixvQ0FBNkM7QUFDN0MsK0JBQTRCO0FBRTVCLE1BQU0sY0FBYyxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWtCLGFBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN2RSxNQUFNLFVBQVUsR0FBRyxTQUFHLENBQUMsR0FBRyxDQUFjLGFBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUUzRCxTQUFzQixHQUFHOztRQUNyQixJQUFJO1lBQ0EsTUFBTSxZQUFZLEdBQXVCLG9CQUFvQixFQUFFLENBQUM7WUFFaEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxjQUFjLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBRXRELE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBZ0IsQ0FBQztZQUM1RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUVuQyxJQUFJLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxFQUFFO2dCQUNuQixVQUFVLENBQUMsWUFBWSxDQUFDLGtDQUFrQyxFQUFFLElBQUksQ0FBQyxDQUFDO2FBQ3JFO2lCQUFNO2dCQUNILFVBQVUsQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDcEQ7U0FFSjtRQUFDLE9BQU8sS0FBSyxFQUFFO1lBQ1osVUFBVSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDckM7SUFDTCxDQUFDO0NBQUE7QUFsQkQsa0JBa0JDO0FBRUQsU0FBUyxvQkFBb0I7SUFFekIsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRTlELE1BQU0sYUFBYSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsa0JBQVUsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUMzRSxNQUFNLGNBQWMsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLGtCQUFVLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFdEUsTUFBTSxrQkFBa0IsR0FBRyxVQUFVLENBQUMsZUFBZSxDQUFDLGtCQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNyRixNQUFNLDBCQUEwQixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsa0JBQVUsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0lBRTlGLE1BQU0sbUJBQW1CLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFaEYsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFN0QsT0FBTztRQUNILFVBQVU7UUFDVixhQUFhO1FBQ2IsY0FBYztRQUNkLGtCQUFrQjtRQUNsQiwwQkFBMEI7UUFDMUIsbUJBQW1CO1FBQ25CLE1BQU07S0FDVCxDQUFDO0FBQ04sQ0FBQztBQUVELEdBQUcsRUFBRSxDQUFDIn0= /***/ }), diff --git a/src/common.ts b/src/common.ts index d62b0b7..e58a79a 100644 --- a/src/common.ts +++ b/src/common.ts @@ -188,7 +188,7 @@ class GitVersionTool implements IGitVersionTool { const args = [ workDir, "/output", - "json", + "json", // need to use buildserver later ]; const { diff --git a/src/github/execute.ts b/src/github/execute.ts index 0b4c6d4..7f04588 100644 --- a/src/github/execute.ts +++ b/src/github/execute.ts @@ -1,6 +1,6 @@ import "reflect-metadata"; -import { IBuildAgent, IGitVersionOptions, IGitVersionTool } from "../interfaces"; +import { IBuildAgent, IGitVersion, IGitVersionOptions, IGitVersionTool } from "../interfaces"; import { RunOptions, TYPES } from "../types"; import { ioc } from "./ioc"; @@ -12,7 +12,9 @@ export async function run() { const inputOptions: IGitVersionOptions = getGitVersionOptions(); const result = await gitVersionTool.run(inputOptions); - console.log(result.stdout); + + const gitversion = JSON.parse(result.stdout) as IGitVersion; + console.log(gitversion.FullSemVer); if (result.code === 0) { buildAgent.setSucceeded("GitVersion executed successfully", true); diff --git a/src/interfaces.ts b/src/interfaces.ts index abcf0f7..5c77218 100644 --- a/src/interfaces.ts +++ b/src/interfaces.ts @@ -56,3 +56,36 @@ export interface IGitVersionOptions { additionalArguments: string; srcDir: string; } + +export interface IGitVersion { + Major: number; + Minor: number; + Patch: number; + PreReleaseTag: string; + PreReleaseTagWithDash: string; + PreReleaseLabel: string; + PreReleaseNumber: number; + WeightedPreReleaseNumber: number; + BuildMetaData: number; + BuildMetaDataPadded: string; + FullBuildMetaData: string; + MajorMinorPatch: string; + SemVer: string; + LegacySemVer: string; + LegacySemVerPadded: string; + AssemblySemVer: string; + AssemblySemFileVer: string; + FullSemVer: string; + InformationalVersion: string; + BranchName: string; + Sha: string; + ShortSha: string; + NuGetVersionV2: string; + NuGetVersion: string; + NuGetPreReleaseTagV2: string; + NuGetPreReleaseTag: string; + VersionSourceSha: string; + CommitsSinceVersionSource: number; + CommitsSinceVersionSourcePadded: string; + CommitDate: string; +}