diff --git a/.azure/ci.yml b/.azure/ci.yml index f7d676d56..60c1f57f9 100644 --- a/.azure/ci.yml +++ b/.azure/ci.yml @@ -11,7 +11,7 @@ variables: - name: DOTNET_CLI_TELEMETRY_OPTOUT value: 'true' - name: INPUT_VERSIONSPEC - value: '5.x' + value: '6.x' - name: INPUT_INCLUDEPRERELEASE value: 'false' - name: INPUT_IGNOREFAILEDSOURCES diff --git a/.azure/example-10.yml b/.azure/example-10.yml index 75743fff4..5c02d0a7c 100644 --- a/.azure/example-10.yml +++ b/.azure/example-10.yml @@ -7,11 +7,11 @@ variables: value: 'true' stages: - - stage: GitVersion_v5_cross_stage - displayName: GitVersion v5 (cross stage) + - stage: GitVersion_v6_cross_stage + displayName: GitVersion v6 (cross stage) jobs: - - job: GitVersion_v5_cross_stage_producer - displayName: GitVersion v5 (cross stage producer) + - job: GitVersion_v6_cross_stage_producer + displayName: GitVersion v6 (cross stage producer) pool: vmImage: ubuntu-latest steps: @@ -21,7 +21,7 @@ stages: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' - task: gitversion/execute@2.0.0 displayName: Determine Version @@ -29,15 +29,15 @@ stages: inputs: overrideConfig: | update-build-number=false - - stage: GitVersion_v5_cross_stage_consumer_without_prefix - displayName: GitVersion v5 (cross stage consumer) - without prefix - dependsOn: GitVersion_v5_cross_stage - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_stage.outputs['GitVersion_v5_cross_stage_producer.version_step.branchName'], 'main')) # use in condition + - stage: GitVersion_v6_cross_stage_consumer_without_prefix + displayName: GitVersion v6 (cross stage consumer) - without prefix + dependsOn: GitVersion_v6_cross_stage + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_stage.outputs['GitVersion_v6_cross_stage_producer.version_step.branchName'], 'main')) # use in condition jobs: - - job: GitVersion_v5_cross_stage_consumer_without_prefix - displayName: GitVersion v5 (cross stage consumer) - without prefix + - job: GitVersion_v6_cross_stage_consumer_without_prefix + displayName: GitVersion v6 (cross stage consumer) - without prefix variables: - myvar_fullSemVer: $[ stageDependencies.GitVersion_v5_cross_stage.GitVersion_v5_cross_stage_producer.outputs['version_step.fullSemVer'] ] + myvar_fullSemVer: $[ stageDependencies.GitVersion_v6_cross_stage.GitVersion_v6_cross_stage_producer.outputs['version_step.fullSemVer'] ] pool: vmImage: ubuntu-latest steps: @@ -60,15 +60,15 @@ stages: displayName: Use mapped local env from job variables (bash - outputs without prefix) env: localvar_fullSemVer: $(myvar_fullSemVer) - - stage: GitVersion_v5_cross_stage_consumer_with_prefix - displayName: GitVersion v5 (cross stage consumer) - with prefix - dependsOn: GitVersion_v5_cross_stage - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_stage.outputs['GitVersion_v5_cross_stage_producer.version_step.GitVersion_BranchName'], 'main')) # use in condition + - stage: GitVersion_v6_cross_stage_consumer_with_prefix + displayName: GitVersion v6 (cross stage consumer) - with prefix + dependsOn: GitVersion_v6_cross_stage + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_stage.outputs['GitVersion_v6_cross_stage_producer.version_step.GitVersion_BranchName'], 'main')) # use in condition jobs: - - job: GitVersion_v5_cross_stage_consumer_with_prefix - displayName: GitVersion v5 (cross stage consumer) - with prefix + - job: GitVersion_v6_cross_stage_consumer_with_prefix + displayName: GitVersion v6 (cross stage consumer) - with prefix variables: - myvar_GitVersion_FullSemVer: $[ stageDependencies.GitVersion_v5_cross_stage.GitVersion_v5_cross_stage_producer.outputs['version_step.GitVersion_FullSemVer'] ] + myvar_GitVersion_FullSemVer: $[ stageDependencies.GitVersion_v6_cross_stage.GitVersion_v6_cross_stage_producer.outputs['version_step.GitVersion_FullSemVer'] ] pool: vmImage: ubuntu-latest steps: diff --git a/.azure/example-8.yml b/.azure/example-8.yml index fa0af6d91..d6cdd1874 100644 --- a/.azure/example-8.yml +++ b/.azure/example-8.yml @@ -7,8 +7,8 @@ variables: value: 'true' jobs: - - job: GitVersion_v5_same_job - displayName: GitVersion v5 (same job) + - job: GitVersion_v6_same_job + displayName: GitVersion v6 (same job) pool: vmImage: ubuntu-latest steps: @@ -18,7 +18,7 @@ jobs: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' - task: gitversion/execute@2.0.0 displayName: Determine Version diff --git a/.azure/example-9.yml b/.azure/example-9.yml index f6a45c7a4..efbf1f2be 100644 --- a/.azure/example-9.yml +++ b/.azure/example-9.yml @@ -7,8 +7,8 @@ variables: value: 'true' jobs: - - job: GitVersion_v5_cross_job - displayName: GitVersion v5 (cross job) + - job: GitVersion_v6_cross_job + displayName: GitVersion v6 (cross job) pool: vmImage: ubuntu-latest steps: @@ -18,7 +18,7 @@ jobs: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' - task: gitversion/execute@2.0.0 displayName: Determine Version @@ -27,12 +27,12 @@ jobs: overrideConfig: | update-build-number=false - - job: GitVersion_v5_cross_job_consumer_without_prefix - displayName: GitVersion v5 (cross job consumer) - without prefix - dependsOn: GitVersion_v5_cross_job - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_job.outputs['version_step.branchName'], 'main')) # use in condition + - job: GitVersion_v6_cross_job_consumer_without_prefix + displayName: GitVersion v6 (cross job consumer) - without prefix + dependsOn: GitVersion_v6_cross_job + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_job.outputs['version_step.branchName'], 'main')) # use in condition variables: - myvar_fullSemVer: $[ dependencies.GitVersion_v5_cross_job.outputs['version_step.fullSemVer'] ] + myvar_fullSemVer: $[ dependencies.GitVersion_v6_cross_job.outputs['version_step.fullSemVer'] ] pool: vmImage: ubuntu-latest steps: @@ -56,12 +56,12 @@ jobs: env: localvar_fullSemVer: $(myvar_fullSemVer) - - job: GitVersion_v5_cross_job_consumer_with_prefix - displayName: GitVersion v5 (cross job consumer) - with prefix - dependsOn: GitVersion_v5_cross_job - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_job.outputs['version_step.GitVersion_BranchName'], 'main')) # use in condition + - job: GitVersion_v6_cross_job_consumer_with_prefix + displayName: GitVersion v6 (cross job consumer) - with prefix + dependsOn: GitVersion_v6_cross_job + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_job.outputs['version_step.GitVersion_BranchName'], 'main')) # use in condition variables: - myvar_GitVersion_FullSemVer: $[ dependencies.GitVersion_v5_cross_job.outputs['version_step.GitVersion_FullSemVer'] ] + myvar_GitVersion_FullSemVer: $[ dependencies.GitVersion_v6_cross_job.outputs['version_step.GitVersion_FullSemVer'] ] pool: vmImage: ubuntu-latest steps: diff --git a/.github/workflows/checkout-path.yml b/.github/workflows/checkout-path.yml index 4a25668c0..438314859 100644 --- a/.github/workflows/checkout-path.yml +++ b/.github/workflows/checkout-path.yml @@ -28,7 +28,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@main with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine version id: gitversion diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4b9975e3..31c467c28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: - name: gitversion/setup uses: ./gitversion/setup with: - versionSpec: '5.x' + versionSpec: '6.x' - name: gitversion/execute id: gitversion # step id used as reference for output values uses: ./gitversion/execute diff --git a/.github/workflows/example-8.yml b/.github/workflows/example-8.yml index 4ff86c23e..432f2d3b4 100644 --- a/.github/workflows/example-8.yml +++ b/.github/workflows/example-8.yml @@ -7,8 +7,8 @@ defaults: shell: pwsh jobs: - GitVersion_v5_same_job: - name: GitVersion v5 (same job) + GitVersion_v6_same_job: + name: GitVersion v6 (same job) runs-on: ubuntu-latest steps: - name: Checkout @@ -19,7 +19,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine Version id: version_step # step id used as reference for output values diff --git a/.github/workflows/example-9.yml b/.github/workflows/example-9.yml index db1cc6904..a4dfc5ebb 100644 --- a/.github/workflows/example-9.yml +++ b/.github/workflows/example-9.yml @@ -7,8 +7,8 @@ defaults: shell: pwsh jobs: - GitVersion_v5_cross_job: - name: GitVersion v5 (cross job) + GitVersion_v6_cross_job: + name: GitVersion v6 (cross job) runs-on: ubuntu-latest outputs: branchName: ${{ steps.version_step.outputs.branchName }} @@ -25,19 +25,19 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine Version id: version_step # step id used as reference for output values uses: gittools/actions/gitversion/execute@v2.0.0 - GitVersion_v5_cross_job_consumer_without_prefix: - name: GitVersion v5 (cross job consumer) - without prefix - needs: GitVersion_v5_cross_job + GitVersion_v6_cross_job_consumer_without_prefix: + name: GitVersion v6 (cross job consumer) - without prefix + needs: GitVersion_v6_cross_job runs-on: ubuntu-latest - if: contains(needs.GitVersion_v5_cross_job.outputs['branchName'], 'main') + if: contains(needs.GitVersion_v6_cross_job.outputs['branchName'], 'main') env: - myvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }} + myvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }} steps: - run: | echo "FullSemVer (env:myvar_fullSemVer) : $env:myvar_fullSemVer" @@ -49,7 +49,7 @@ jobs: name: Use local env mapped from output (pwsh - outputs without prefix) shell: pwsh env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }} - run: | echo "FullSemVer (env:localvar_fullSemVer) : $env:localvar_fullSemVer" @@ -59,7 +59,7 @@ jobs: localvar_fullSemVer: ${{ env.myvar_fullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }}" name: Use direct output from previous job (pwsh - outputs without prefix) shell: pwsh @@ -73,7 +73,7 @@ jobs: name: Use local env mapped from output (bash - outputs without prefix) shell: bash env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }} - run: | echo "FullSemVer (localvar_fullSemVer) : $localvar_fullSemVer" @@ -83,17 +83,17 @@ jobs: localvar_fullSemVer: ${{ env.myvar_fullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }}" name: Use direct output from previous job (bash - outputs without prefix) shell: bash - GitVersion_v5_cross_job_consumer_with_prefix: - name: GitVersion v5 (cross job consumer) - with prefix - needs: GitVersion_v5_cross_job + GitVersion_v6_cross_job_consumer_with_prefix: + name: GitVersion v6 (cross job consumer) - with prefix + needs: GitVersion_v6_cross_job runs-on: ubuntu-latest - if: contains(needs.GitVersion_v5_cross_job.outputs['GitVersion_BranchName'], 'main') + if: contains(needs.GitVersion_v6_cross_job.outputs['GitVersion_BranchName'], 'main') env: - myvar_GitVersion_FullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }} + myvar_GitVersion_FullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }} steps: - run: | echo "FullSemVer (env:myvar_GitVersion_FullSemVer) : $env:myvar_GitVersion_FullSemVer" @@ -105,7 +105,7 @@ jobs: name: Use local env mapped from output (pwsh - outputs without prefix) shell: pwsh env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }} - run: | echo "FullSemVer (env:localvar_fullSemVer) : $env:localvar_fullSemVer" @@ -115,7 +115,7 @@ jobs: localvar_fullSemVer: ${{ env.myvar_GitVersion_FullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }}" name: Use direct output from previous job (pwsh - outputs without prefix) shell: pwsh @@ -129,7 +129,7 @@ jobs: name: Use local env mapped from output (bash - outputs without prefix) shell: bash env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }} - run: | echo "FullSemVer (localvar_fullSemVer) : $localvar_fullSemVer" @@ -139,6 +139,6 @@ jobs: localvar_fullSemVer: ${{ env.myvar_GitVersion_FullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }}" name: Use direct output from previous job (bash - outputs without prefix) shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ea6777e5..28b58ca0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Install GitVersion uses: ./gitversion/setup with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Use GitVersion id: gitversion # step id used as reference for output values uses: ./gitversion/execute diff --git a/dist/azure/gitversion/setup/task.json b/dist/azure/gitversion/setup/task.json index 577ff7e03..923c3691b 100644 --- a/dist/azure/gitversion/setup/task.json +++ b/dist/azure/gitversion/setup/task.json @@ -28,7 +28,7 @@ "label": "The version spec", "defaultValue": "", "required": true, - "helpMarkDown": "Required version in the form of 5.x or exact version like 5.12.0" + "helpMarkDown": "Required version in the form of 6.x or exact version like 6.0.0" }, { "name": "includePrerelease", @@ -55,4 +55,4 @@ "helpMarkDown": "Prefer to download the latest version matching the versionSpec, even if there is a local cached version." } ] -} \ No newline at end of file +} diff --git a/docs/examples/azure/gitreleasemanager/setup.md b/docs/examples/azure/gitreleasemanager/setup.md index e2a0f794a..b3abcfb67 100644 --- a/docs/examples/azure/gitreleasemanager/setup.md +++ b/docs/examples/azure/gitreleasemanager/setup.md @@ -4,7 +4,7 @@ The Setup GitReleaseManager action accepts the following inputs: ```yaml versionSpec: - description: Required version in the form of 0.17.x or exact version like 0.17.0. + description: Required version in the form of 0.18.x or exact version like 0.18.0. required: true default: '' includePrerelease: @@ -19,37 +19,37 @@ ignoreFailedSources: ### Example 1 -Install the latest GitReleaseManager 0.17.x version. +Install the latest GitReleaseManager 0.18.x version. ```yaml steps: - task: gitreleasemanager/setup@2.0.0 displayName: Install GitReleaseManager inputs: - versionSpec: '0.17.x' + versionSpec: '0.18.x' ``` ### Example 2 -Install specific GitReleaseManager version 0.17.0. +Install specific GitReleaseManager version 0.18.0. ```yaml steps: - task: gitreleasemanager/setup@2.0.0 displayName: Install GitReleaseManager inputs: - versionSpec: '0.17.0' + versionSpec: '0.18.0' ``` ### Example 3 -Install the latest GitReleaseManager 0.17.x version even it there is a cached version matching the versionSpec. +Install the latest GitReleaseManager 0.18.x version even it there is a cached version matching the versionSpec. ```yaml steps: - task: gitreleasemanager/setup@2.0.0 displayName: Install GitReleaseManager inputs: - versionSpec: '0.17.x' + versionSpec: '0.18.x' preferLatestVersion: true ``` diff --git a/docs/examples/azure/gitversion/execute/usage-examples.md b/docs/examples/azure/gitversion/execute/usage-examples.md index 2f2fafae3..f4dc19b84 100644 --- a/docs/examples/azure/gitversion/execute/usage-examples.md +++ b/docs/examples/azure/gitversion/execute/usage-examples.md @@ -13,7 +13,7 @@ steps: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' ``` These steps are omitted from the examples for brevity. @@ -250,8 +250,8 @@ The multi-job output variables can be accessed across jobs and stages, in both c ```yaml jobs: - - job: GitVersion_v5_same_job - displayName: GitVersion v5 (same job) + - job: GitVersion_v6_same_job + displayName: GitVersion v6 (same job) pool: vmImage: ubuntu-latest steps: @@ -261,7 +261,7 @@ jobs: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' - task: gitversion/execute@2.0.0 displayName: Determine Version @@ -318,8 +318,8 @@ jobs: ```yaml jobs: - - job: GitVersion_v5_cross_job - displayName: GitVersion v5 (cross job) + - job: GitVersion_v6_cross_job + displayName: GitVersion v6 (cross job) pool: vmImage: ubuntu-latest steps: @@ -329,7 +329,7 @@ jobs: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' - task: gitversion/execute@2.0.0 displayName: Determine Version @@ -338,12 +338,12 @@ jobs: overrideConfig: | update-build-number=false - - job: GitVersion_v5_cross_job_consumer_without_prefix - displayName: GitVersion v5 (cross job consumer) - without prefix - dependsOn: GitVersion_v5_cross_job - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_job.outputs['version_step.branchName'], 'main')) # use in condition + - job: GitVersion_v6_cross_job_consumer_without_prefix + displayName: GitVersion v6 (cross job consumer) - without prefix + dependsOn: GitVersion_v6_cross_job + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_job.outputs['version_step.branchName'], 'main')) # use in condition variables: - myvar_fullSemVer: $[ dependencies.GitVersion_v5_cross_job.outputs['version_step.fullSemVer'] ] + myvar_fullSemVer: $[ dependencies.GitVersion_v6_cross_job.outputs['version_step.fullSemVer'] ] pool: vmImage: ubuntu-latest steps: @@ -367,12 +367,12 @@ jobs: env: localvar_fullSemVer: $(myvar_fullSemVer) - - job: GitVersion_v5_cross_job_consumer_with_prefix - displayName: GitVersion v5 (cross job consumer) - with prefix - dependsOn: GitVersion_v5_cross_job - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_job.outputs['version_step.GitVersion_BranchName'], 'main')) # use in condition + - job: GitVersion_v6_cross_job_consumer_with_prefix + displayName: GitVersion v6 (cross job consumer) - with prefix + dependsOn: GitVersion_v6_cross_job + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_job.outputs['version_step.GitVersion_BranchName'], 'main')) # use in condition variables: - myvar_GitVersion_FullSemVer: $[ dependencies.GitVersion_v5_cross_job.outputs['version_step.GitVersion_FullSemVer'] ] + myvar_GitVersion_FullSemVer: $[ dependencies.GitVersion_v6_cross_job.outputs['version_step.GitVersion_FullSemVer'] ] pool: vmImage: ubuntu-latest steps: @@ -404,11 +404,11 @@ jobs: ```yaml stages: - - stage: GitVersion_v5_cross_stage - displayName: GitVersion v5 (cross stage) + - stage: GitVersion_v6_cross_stage + displayName: GitVersion v6 (cross stage) jobs: - - job: GitVersion_v5_cross_stage_producer - displayName: GitVersion v5 (cross stage producer) + - job: GitVersion_v6_cross_stage_producer + displayName: GitVersion v6 (cross stage producer) pool: vmImage: ubuntu-latest steps: @@ -418,7 +418,7 @@ stages: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' - task: gitversion/execute@2.0.0 displayName: Determine Version @@ -426,15 +426,15 @@ stages: inputs: overrideConfig: | update-build-number=false - - stage: GitVersion_v5_cross_stage_consumer_without_prefix - displayName: GitVersion v5 (cross stage consumer) - without prefix - dependsOn: GitVersion_v5_cross_stage - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_stage.outputs['GitVersion_v5_cross_stage_producer.version_step.branchName'], 'main')) # use in condition + - stage: GitVersion_v6_cross_stage_consumer_without_prefix + displayName: GitVersion v6 (cross stage consumer) - without prefix + dependsOn: GitVersion_v6_cross_stage + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_stage.outputs['GitVersion_v6_cross_stage_producer.version_step.branchName'], 'main')) # use in condition jobs: - - job: GitVersion_v5_cross_stage_consumer_without_prefix - displayName: GitVersion v5 (cross stage consumer) - without prefix + - job: GitVersion_v6_cross_stage_consumer_without_prefix + displayName: GitVersion v6 (cross stage consumer) - without prefix variables: - myvar_fullSemVer: $[ stageDependencies.GitVersion_v5_cross_stage.GitVersion_v5_cross_stage_producer.outputs['version_step.fullSemVer'] ] + myvar_fullSemVer: $[ stageDependencies.GitVersion_v6_cross_stage.GitVersion_v6_cross_stage_producer.outputs['version_step.fullSemVer'] ] pool: vmImage: ubuntu-latest steps: @@ -457,15 +457,15 @@ stages: displayName: Use mapped local env from job variables (bash - outputs without prefix) env: localvar_fullSemVer: $(myvar_fullSemVer) - - stage: GitVersion_v5_cross_stage_consumer_with_prefix - displayName: GitVersion v5 (cross stage consumer) - with prefix - dependsOn: GitVersion_v5_cross_stage - condition: and(succeeded(), eq(dependencies.GitVersion_v5_cross_stage.outputs['GitVersion_v5_cross_stage_producer.version_step.GitVersion_BranchName'], 'main')) # use in condition + - stage: GitVersion_v6_cross_stage_consumer_with_prefix + displayName: GitVersion v6 (cross stage consumer) - with prefix + dependsOn: GitVersion_v6_cross_stage + condition: and(succeeded(), eq(dependencies.GitVersion_v6_cross_stage.outputs['GitVersion_v6_cross_stage_producer.version_step.GitVersion_BranchName'], 'main')) # use in condition jobs: - - job: GitVersion_v5_cross_stage_consumer_with_prefix - displayName: GitVersion v5 (cross stage consumer) - with prefix + - job: GitVersion_v6_cross_stage_consumer_with_prefix + displayName: GitVersion v6 (cross stage consumer) - with prefix variables: - myvar_GitVersion_FullSemVer: $[ stageDependencies.GitVersion_v5_cross_stage.GitVersion_v5_cross_stage_producer.outputs['version_step.GitVersion_FullSemVer'] ] + myvar_GitVersion_FullSemVer: $[ stageDependencies.GitVersion_v6_cross_stage.GitVersion_v6_cross_stage_producer.outputs['version_step.GitVersion_FullSemVer'] ] pool: vmImage: ubuntu-latest steps: diff --git a/docs/examples/azure/gitversion/setup/usage-examples.md b/docs/examples/azure/gitversion/setup/usage-examples.md index d65425fc6..3f45acf10 100644 --- a/docs/examples/azure/gitversion/setup/usage-examples.md +++ b/docs/examples/azure/gitversion/setup/usage-examples.md @@ -10,7 +10,7 @@ The Setup GitVersion task accepts the following inputs: ```yaml versionSpec: - description: Required version in the form of 5.x or exact version like 5.12.0. + description: Required version in the form of 6.x or exact version like 6.0.0. required: true default: '' includePrerelease: @@ -41,26 +41,26 @@ steps: ### Example 1 -Install the latest GitVersion 5 version. +Install the latest GitVersion 6 version. ```yaml steps: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' ``` ### Example 2 -Install GitVersion 5.12.0. +Install GitVersion 6.0.0. ```yaml steps: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.12.0' + versionSpec: '6.0.0' ``` ### Example 3 @@ -78,13 +78,13 @@ steps: ### Example 4 -Install the latest GitVersion 5 version even it there is a cached version matching the versionSpec. +Install the latest GitVersion 6 version even it there is a cached version matching the versionSpec. ```yaml steps: - task: gitversion/setup@2.0.0 displayName: Install GitVersion inputs: - versionSpec: '5.x' + versionSpec: '6.x' preferLatestVersion: true ``` diff --git a/docs/examples/github/gitreleasemanager/setup.md b/docs/examples/github/gitreleasemanager/setup.md index 5748c3718..742b2263d 100644 --- a/docs/examples/github/gitreleasemanager/setup.md +++ b/docs/examples/github/gitreleasemanager/setup.md @@ -4,7 +4,7 @@ The Setup GitReleaseManager action accepts the following inputs: ```yaml versionSpec: - description: Required version in the form of 0.17.x or exact version like 0.17.0. + description: Required version in the form of 0.18.x or exact version like 0.18.0. required: true default: '' includePrerelease: @@ -19,37 +19,37 @@ ignoreFailedSources: ### Example 1 -Install the latest GitReleaseManager 0.17.x version. +Install the latest GitReleaseManager 0.18.x version. ```yaml steps: - name: Install GitReleaseManager uses: gittools/actions/gitreleasemanager/setup@v2.0.0 with: - versionSpec: '0.17.x' + versionSpec: '0.18.x' ``` ### Example 2 -Install specific GitReleaseManager version 0.17.0. +Install specific GitReleaseManager version 0.18.0. ```yaml steps: - name: Install GitReleaseManager uses: gittools/actions/gitreleasemanager/setup@v2.0.0 with: - versionSpec: '0.17.0' + versionSpec: '0.18.0' ``` ### Example 3 -Install the latest GitReleaseManager 0.17.x version even it there is a cached version matching the versionSpec.~~~~ +Install the latest GitReleaseManager 0.18.x version even it there is a cached version matching the versionSpec.~~~~ ```yaml steps: - name: Install GitReleaseManager uses: gittools/actions/gitreleasemanager/setup@v2.0.0 with: - versionSpec: '0.17.x' + versionSpec: '0.18.x' preferLatestVersion: true ``` diff --git a/docs/examples/github/gitversion/execute/usage-examples.md b/docs/examples/github/gitversion/execute/usage-examples.md index fbd885e41..79de01915 100644 --- a/docs/examples/github/gitversion/execute/usage-examples.md +++ b/docs/examples/github/gitversion/execute/usage-examples.md @@ -15,7 +15,7 @@ steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' ``` These steps are omitted from the examples for brevity. @@ -249,8 +249,8 @@ The action also creates environment variables of the form `${{ env. ```yaml jobs: - GitVersion_v5_same_job: - name: GitVersion v5 (same job) + GitVersion_v6_same_job: + name: GitVersion v6 (same job) runs-on: ubuntu-latest steps: - name: Checkout @@ -261,7 +261,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine Version id: version_step # step id used as reference for output values @@ -332,8 +332,8 @@ jobs: ```yaml jobs: - GitVersion_v5_cross_job: - name: GitVersion v5 (cross job) + GitVersion_v6_cross_job: + name: GitVersion v6 (cross job) runs-on: ubuntu-latest outputs: branchName: ${{ steps.version_step.outputs.branchName }} @@ -350,19 +350,19 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine Version id: version_step # step id used as reference for output values uses: gittools/actions/gitversion/execute@v2.0.0 - GitVersion_v5_cross_job_consumer_without_prefix: - name: GitVersion v5 (cross job consumer) - without prefix - needs: GitVersion_v5_cross_job + GitVersion_v6_cross_job_consumer_without_prefix: + name: GitVersion v6 (cross job consumer) - without prefix + needs: GitVersion_v6_cross_job runs-on: ubuntu-latest - if: contains(needs.GitVersion_v5_cross_job.outputs['branchName'], 'main') + if: contains(needs.GitVersion_v6_cross_job.outputs['branchName'], 'main') env: - myvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }} + myvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }} steps: - run: | echo "FullSemVer (env:myvar_fullSemVer) : $env:myvar_fullSemVer" @@ -374,7 +374,7 @@ jobs: name: Use local env mapped from output (pwsh - outputs without prefix) shell: pwsh env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }} - run: | echo "FullSemVer (env:localvar_fullSemVer) : $env:localvar_fullSemVer" @@ -384,7 +384,7 @@ jobs: localvar_fullSemVer: ${{ env.myvar_fullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }}" name: Use direct output from previous job (pwsh - outputs without prefix) shell: pwsh @@ -398,7 +398,7 @@ jobs: name: Use local env mapped from output (bash - outputs without prefix) shell: bash env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }} - run: | echo "FullSemVer (localvar_fullSemVer) : $localvar_fullSemVer" @@ -408,17 +408,17 @@ jobs: localvar_fullSemVer: ${{ env.myvar_fullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.fullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.fullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.fullSemVer }}" name: Use direct output from previous job (bash - outputs without prefix) shell: bash - GitVersion_v5_cross_job_consumer_with_prefix: - name: GitVersion v5 (cross job consumer) - with prefix - needs: GitVersion_v5_cross_job + GitVersion_v6_cross_job_consumer_with_prefix: + name: GitVersion v6 (cross job consumer) - with prefix + needs: GitVersion_v6_cross_job runs-on: ubuntu-latest - if: contains(needs.GitVersion_v5_cross_job.outputs['GitVersion_BranchName'], 'main') + if: contains(needs.GitVersion_v6_cross_job.outputs['GitVersion_BranchName'], 'main') env: - myvar_GitVersion_FullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }} + myvar_GitVersion_FullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }} steps: - run: | echo "FullSemVer (env:myvar_GitVersion_FullSemVer) : $env:myvar_GitVersion_FullSemVer" @@ -430,7 +430,7 @@ jobs: name: Use local env mapped from output (pwsh - outputs without prefix) shell: pwsh env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }} - run: | echo "FullSemVer (env:localvar_fullSemVer) : $env:localvar_fullSemVer" @@ -440,7 +440,7 @@ jobs: localvar_fullSemVer: ${{ env.myvar_GitVersion_FullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }}" name: Use direct output from previous job (pwsh - outputs without prefix) shell: pwsh @@ -454,7 +454,7 @@ jobs: name: Use local env mapped from output (bash - outputs without prefix) shell: bash env: - localvar_fullSemVer: ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }} + localvar_fullSemVer: ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }} - run: | echo "FullSemVer (localvar_fullSemVer) : $localvar_fullSemVer" @@ -464,7 +464,7 @@ jobs: localvar_fullSemVer: ${{ env.myvar_GitVersion_FullSemVer }} - run: | - echo "FullSemVer (needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v5_cross_job.outputs.GitVersion_FullSemVer }}" + echo "FullSemVer (needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer) : ${{ needs.GitVersion_v6_cross_job.outputs.GitVersion_FullSemVer }}" name: Use direct output from previous job (bash - outputs without prefix) shell: bash ``` diff --git a/docs/examples/github/gitversion/setup/usage-examples.md b/docs/examples/github/gitversion/setup/usage-examples.md index b1dcc2a74..c4c4cd1e9 100644 --- a/docs/examples/github/gitversion/setup/usage-examples.md +++ b/docs/examples/github/gitversion/setup/usage-examples.md @@ -10,7 +10,7 @@ The Setup GitVersion action accepts the following inputs: ```yaml versionSpec: - description: Required version in the form of 5.x or exact version like 5.12.0. + description: Required version in the form of 6.x or exact version like 6.0.0. required: true default: '' includePrerelease: @@ -40,26 +40,26 @@ steps: ### Example 1 -Install the latest GitVersion 5 version. +Install the latest GitVersion 6 version. ```yaml steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' ``` ### Example 2 -Install GitVersion 5.12.0. +Install GitVersion 6.0.0. ```yaml steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.12.0' + versionSpec: '6.0.0' ``` ### Example 3 @@ -77,13 +77,13 @@ steps: ### Example 4 -Install the latest GitVersion 5 version even it there is a cached version matching the versionSpec. +Install the latest GitVersion 6 version even it there is a cached version matching the versionSpec. ```yaml steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.0 with: - versionSpec: '5.x' + versionSpec: '6.x' preferLatestVersion: true ``` diff --git a/docs/versions.md b/docs/versions.md index 0c9553d2f..d1246334a 100644 --- a/docs/versions.md +++ b/docs/versions.md @@ -1,5 +1,5 @@ | GitTools/actions | GitVersion | GitReleaseManager | |------------------|------------------|--------------------| | v1.x | `>=5.2.0 <6.1.0` | `>=0.10.0 <0.18.0` | -| v2.x | `>=6.1.0` | `>=0.18.0` | -| v3.x | `>=7.x` | `>=0.18.0` | +| v2.x | `>=5.2.0 <6.1.0` | `>=0.10.0 <0.20.0` | +| v3.x | `>=6.1.0` | `>=0.20.0` | diff --git a/envs/gitversion/execute/azure.env b/envs/gitversion/execute/azure.env index 2ca9802b5..e71d298c1 100644 --- a/envs/gitversion/execute/azure.env +++ b/envs/gitversion/execute/azure.env @@ -1,4 +1,4 @@ BUILD_SOURCESDIRECTORY=. AGENT_TEMPDIRECTORY=./.test/temp AGENT_TOOLSDIRECTORY=./.test/tools -GITVERSION_PATH=./.test/tools/GitVersion.Tool/5.12.0 +GITVERSION_PATH=./.test/tools/GitVersion.Tool/6.0.0 diff --git a/envs/gitversion/execute/github.env b/envs/gitversion/execute/github.env index dfeace859..863b2804a 100644 --- a/envs/gitversion/execute/github.env +++ b/envs/gitversion/execute/github.env @@ -1,4 +1,4 @@ GITHUB_WORKSPACE=. RUNNER_TEMP=./.test/temp RUNNER_TOOL_CACHE=./.test/tools -GITVERSION_PATH=./.test/tools/GitVersion.Tool/5.12.0 +GITVERSION_PATH=./.test/tools/GitVersion.Tool/6.10.0 diff --git a/envs/gitversion/execute/local.env b/envs/gitversion/execute/local.env index 3a15acffd..04df64eac 100644 --- a/envs/gitversion/execute/local.env +++ b/envs/gitversion/execute/local.env @@ -1,4 +1,4 @@ AGENT_SOURCE_DIR=. AGENT_TEMP_DIR=./.test/temp AGENT_TOOLS_DIR=./.test/tools -GITVERSION_PATH=./.test/tools/GitVersion.Tool/5.12.0 +GITVERSION_PATH=./.test/tools/GitVersion.Tool/6.0.0 diff --git a/envs/gitversion/setup/azure.env b/envs/gitversion/setup/azure.env index 257b16c2d..4eac80ace 100644 --- a/envs/gitversion/setup/azure.env +++ b/envs/gitversion/setup/azure.env @@ -4,4 +4,4 @@ AGENT_TOOLSDIRECTORY=./.test/tools INPUT_IGNOREFAILEDSOURCES=true INPUT_INCLUDEPRERELEASE=false INPUT_PREFERLATESTVERSION=false -INPUT_VERSIONSPEC=5.12.x \ No newline at end of file +INPUT_VERSIONSPEC=6.x diff --git a/envs/gitversion/setup/github.env b/envs/gitversion/setup/github.env index d9f6c8f11..2a09afbcb 100644 --- a/envs/gitversion/setup/github.env +++ b/envs/gitversion/setup/github.env @@ -4,4 +4,4 @@ RUNNER_TOOL_CACHE=./.test/tools INPUT_IGNOREFAILEDSOURCES=true INPUT_INCLUDEPRERELEASE=false INPUT_PREFERLATESTVERSION=false -INPUT_VERSIONSPEC=5.12.x \ No newline at end of file +INPUT_VERSIONSPEC=6.x diff --git a/envs/gitversion/setup/local.env b/envs/gitversion/setup/local.env index 6e81d5480..f87d858bf 100644 --- a/envs/gitversion/setup/local.env +++ b/envs/gitversion/setup/local.env @@ -4,4 +4,4 @@ AGENT_TOOLS_DIR=./.test/tools INPUT_IGNOREFAILEDSOURCES=true INPUT_INCLUDEPRERELEASE=false INPUT_PREFERLATESTVERSION=false -INPUT_VERSIONSPEC=5.12.x \ No newline at end of file +INPUT_VERSIONSPEC=6.x diff --git a/gitversion/setup/action.yml b/gitversion/setup/action.yml index 5193941af..a249d5ea6 100644 --- a/gitversion/setup/action.yml +++ b/gitversion/setup/action.yml @@ -10,7 +10,7 @@ runs: inputs: versionSpec: - description: Required version in the form of 5.x or exact version like 5.12.0 + description: Required version in the form of 6.x or exact version like 6.0.0 required: true default: '' includePrerelease: diff --git a/src/__tests__/tools/common/settings.spec.ts b/src/__tests__/tools/common/settings.spec.ts index 7447a88b3..da0dc4dcf 100644 --- a/src/__tests__/tools/common/settings.spec.ts +++ b/src/__tests__/tools/common/settings.spec.ts @@ -5,7 +5,7 @@ import { SettingsProvider, type SetupSettings } from '@tools/common' describe('SettingsProvider', () => { it('should return SetupSettings', () => { const settings = { - versionSpec: '5.x', + versionSpec: '6.x', includePrerelease: false, ignoreFailedSources: true, preferLatestVersion: false diff --git a/src/__tests__/tools/gitversion/runner.spec.ts b/src/__tests__/tools/gitversion/runner.spec.ts index 4443ab995..eb218fe38 100644 --- a/src/__tests__/tools/gitversion/runner.spec.ts +++ b/src/__tests__/tools/gitversion/runner.spec.ts @@ -13,7 +13,7 @@ import { keysFn, type SetupSettings } from '@tools/common' describe('GitVersion Runner', () => { const baseDir = path.resolve(__dirname, '../../../../.test') const envName = process.platform === 'win32' ? 'Path' : 'PATH' - const version = '5.12.0' + const version = '6.0.0' const toolPath = path.resolve(baseDir, 'tools', 'GitVersion.Tool', version) const toolPathVariable = 'GITVERSION_PATH' const toolName = 'dotnet-gitversion' @@ -59,7 +59,7 @@ describe('GitVersion Runner', () => { it.sequential('should run setup GitVersion', async () => { setInputs({ - versionSpec: '5.12.x', + versionSpec: '6.x', includePrerelease: false, ignoreFailedSources: false, preferLatestVersion: false