diff --git a/dist/azure/gitversion/execute/task.json b/dist/azure/gitversion/execute/task.json index b35ae8e65..6a7eac9f2 100644 --- a/dist/azure/gitversion/execute/task.json +++ b/dist/azure/gitversion/execute/task.json @@ -38,6 +38,116 @@ "isExpanded": false } ], + "outputVariables": [ + { + "name": "major", + "description": "The Major value" + }, + { + "name": "minor", + "description": "The Minor value" + }, + { + "name": "patch", + "description": "The Patch value" + }, + { + "name": "preReleaseTag", + "description": "The PreReleaseTag value" + }, + { + "name": "preReleaseTagWithDash", + "description": "The PreReleaseTagWithDash value" + }, + { + "name": "preReleaseLabel", + "description": "The PreReleaseLabel value" + }, + { + "name": "preReleaseNumber", + "description": "The PreReleaseNumber value" + }, + { + "name": "weightedPreReleaseNumber", + "description": "The WeightedPreReleaseNumber value" + }, + { + "name": "buildMetaData", + "description": "The BuildMetaData value" + }, + { + "name": "fullBuildMetaData", + "description": "The FullBuildMetaData value" + }, + { + "name": "majorMinorPatch", + "description": "The MajorMinorPatch value" + }, + { + "name": "semVer", + "description": "The SemVer value" + }, + { + "name": "assemblySemVer", + "description": "The AssemblySemVer value" + }, + { + "name": "assemblySemFileVer", + "description": "The AssemblySemFileVer value" + }, + { + "name": "fullSemVer", + "description": "The FullSemVer value" + }, + { + "name": "informationalVersion", + "description": "The InformationalVersion value" + }, + { + "name": "branchName", + "description": "The BranchName value" + }, + { + "name": "escapedBranchName", + "description": "The EscapedBranchName value" + }, + { + "name": "sha", + "description": "The Sha value" + }, + { + "name": "shortSha", + "description": "The ShortSha value" + }, + { + "name": "versionSourceSha", + "description": "The VersionSourceSha value" + }, + { + "name": "commitsSinceVersionSource", + "description": "The CommitsSinceVersionSource value (deprecated in 6.6.0, use versionSourceDistance instead; will be removed in v7.0.0)" + }, + { + "name": "versionSourceSemVer", + "description": "The VersionSourceSemVer value (since 6.6.0)" + }, + { + "name": "versionSourceDistance", + "description": "The VersionSourceDistance value (since 6.6.0)" + }, + { + "name": "versionSourceIncrement", + "description": "The VersionSourceIncrement value (since 6.6.0)" + }, + { + "name": "uncommittedChanges", + "description": "The UncommittedChanges value" + }, + { + "name": "commitDate", + "description": "The CommitDate value" + } + ], "inputs": [ { "name": "targetPath", diff --git a/docs/examples/azure/gitversion/execute.md b/docs/examples/azure/gitversion/execute.md index 15b854a8a..740a512b9 100644 --- a/docs/examples/azure/gitversion/execute.md +++ b/docs/examples/azure/gitversion/execute.md @@ -104,8 +104,11 @@ The Execute GitVersion task creates the following job-scoped variables and multi - nuGetPreReleaseTagV2 (removed in 6.0.0) - nuGetPreReleaseTag (removed in 6.0.0) - versionSourceSha -- commitsSinceVersionSource +- commitsSinceVersionSource (deprecated in 6.6.0, use versionSourceDistance instead; will be removed in v7.0.0) - commitsSinceVersionSourcePadded (since 5.2.0, removed in 6.0.0) +- versionSourceSemVer (since 6.6.0) +- versionSourceDistance (since 6.6.0) +- versionSourceIncrement (since 6.6.0) - uncommittedChanges (since 5.5.0) - commitDate diff --git a/docs/examples/github/gitversion/execute.md b/docs/examples/github/gitversion/execute.md index 84ab36c11..5d3e7fbf4 100644 --- a/docs/examples/github/gitversion/execute.md +++ b/docs/examples/github/gitversion/execute.md @@ -100,8 +100,11 @@ The Execute GitVersion action creates the following outputs: - nuGetPreReleaseTagV2 (removed in 6.0.0) - nuGetPreReleaseTag (removed in 6.0.0) - versionSourceSha -- commitsSinceVersionSource +- commitsSinceVersionSource (deprecated in 6.6.0, use versionSourceDistance instead; will be removed in v7.0.0) - commitsSinceVersionSourcePadded (since 5.2.0, removed in 6.0.0) +- versionSourceSemVer (since 6.6.0) +- versionSourceDistance (since 6.6.0) +- versionSourceIncrement (since 6.6.0) - uncommittedChanges (since 5.5.0) - commitDate diff --git a/gitversion/execute/action.yml b/gitversion/execute/action.yml index e6c73f63f..0b3f0e06e 100644 --- a/gitversion/execute/action.yml +++ b/gitversion/execute/action.yml @@ -90,7 +90,13 @@ outputs: versionSourceSha: description: 'The VersionSourceSha value' commitsSinceVersionSource: - description: 'The CommitsSinceVersionSource value' + description: 'The CommitsSinceVersionSource value (deprecated in 6.6.0, use versionSourceDistance instead; will be removed in v7.0.0)' + versionSourceSemVer: + description: 'The VersionSourceSemVer value (since 6.6.0)' + versionSourceDistance: + description: 'The VersionSourceDistance value (since 6.6.0)' + versionSourceIncrement: + description: 'The VersionSourceIncrement value (since 6.6.0)' uncommittedChanges: description: 'The UncommittedChanges value' commitDate: diff --git a/package-lock.json b/package-lock.json index 001189ff3..014db8dec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1275,6 +1275,7 @@ "integrity": "sha512-m0jEgYlYz+mDJZ2+F4v8D1AyQb+QzsNqRuI7xg1VQX/KlKS0qT9r1Mo16yo5F/MtifXFgaofIFsdFMox2SxIbQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -1338,6 +1339,7 @@ "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.54.0", "@typescript-eslint/types": "8.54.0", @@ -1693,6 +1695,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3093,6 +3096,7 @@ "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -3153,6 +3157,7 @@ "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==", "dev": true, "license": "MIT", + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -6174,6 +6179,7 @@ "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -7375,6 +7381,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -7597,6 +7604,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7729,6 +7737,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -7867,6 +7876,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -7880,6 +7890,7 @@ "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/expect": "4.0.18", "@vitest/mocker": "4.0.18", diff --git a/src/__tests__/tools/gitversion/runner.spec.ts b/src/__tests__/tools/gitversion/runner.spec.ts index 40b77d6e4..1ea3549bb 100644 --- a/src/__tests__/tools/gitversion/runner.spec.ts +++ b/src/__tests__/tools/gitversion/runner.spec.ts @@ -273,6 +273,9 @@ function createGitVersionFixture(params: { BuildMetaData: buildMetaData, CommitDate: commitDate, CommitsSinceVersionSource: buildMetaData, + VersionSourceSemVer: '1.2.3', + VersionSourceDistance: buildMetaData, + VersionSourceIncrement: 'Patch', EscapedBranchName: escapedBranchName, FullBuildMetaData: fullBuildMetaData, FullSemVer: fullSemVer, diff --git a/src/tools/gitversion/models.ts b/src/tools/gitversion/models.ts index 89106bf18..2a8a3972a 100644 --- a/src/tools/gitversion/models.ts +++ b/src/tools/gitversion/models.ts @@ -42,6 +42,9 @@ export type GitVersionOutput = { ShortSha: string VersionSourceSha: string CommitsSinceVersionSource: number + VersionSourceSemVer?: string + VersionSourceDistance?: number + VersionSourceIncrement?: string UncommittedChanges: number CommitDate: string }