diff --git a/.azure/ci.yml b/.azure/ci.yml index a7873d0a6..43a7fce98 100644 --- a/.azure/ci.yml +++ b/.azure/ci.yml @@ -13,7 +13,7 @@ variables: - name: DOTNET_CLI_TELEMETRY_OPTOUT value: 'true' - name: INPUT_VERSIONSPEC - value: '6.0.x' + value: '6.1.x' - name: INPUT_INCLUDEPRERELEASE value: 'false' - name: INPUT_IGNOREFAILEDSOURCES diff --git a/.azure/example-7.yml b/.azure/example-7.yml index c8e4eeaf2..a3102cc46 100644 --- a/.azure/example-7.yml +++ b/.azure/example-7.yml @@ -18,7 +18,7 @@ jobs: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - task: gitversion/execute@3.1.1 displayName: Determine Version diff --git a/.azure/example-8.yml b/.azure/example-8.yml index 370e1b41c..dc8e00404 100644 --- a/.azure/example-8.yml +++ b/.azure/example-8.yml @@ -18,7 +18,7 @@ jobs: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - task: gitversion/execute@3.1.1 displayName: Determine Version diff --git a/.azure/example-9.yml b/.azure/example-9.yml index 02463ab96..f8e957fd6 100644 --- a/.azure/example-9.yml +++ b/.azure/example-9.yml @@ -21,7 +21,7 @@ stages: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - task: gitversion/execute@3.1.1 displayName: Determine Version diff --git a/.github/workflows/checkout-path.yml b/.github/workflows/checkout-path.yml index 145580169..ad4bd9b4f 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: '6.0.x' + versionSpec: '6.1.x' - name: Determine version id: gitversion diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36c9b188e..260c1b411 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - name: gitversion/setup uses: ./gitversion/setup with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - name: gitversion/command (showvariable) uses: ./gitversion/command with: diff --git a/.github/workflows/example-7.yml b/.github/workflows/example-7.yml index b3df623f0..e569cad4f 100644 --- a/.github/workflows/example-7.yml +++ b/.github/workflows/example-7.yml @@ -19,7 +19,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - name: Determine Version id: version_step # step id used as reference for output values diff --git a/.github/workflows/example-8.yml b/.github/workflows/example-8.yml index c1f2a9138..08cf94509 100644 --- a/.github/workflows/example-8.yml +++ b/.github/workflows/example-8.yml @@ -25,7 +25,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - name: Determine Version id: version_step # step id used as reference for output values diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0217ee815..e508f39ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Install GitVersion uses: ./gitversion/setup with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - name: Install GitReleaseManager uses: ./gitreleasemanager/setup with: diff --git a/dist/azure/gitversion/setup/task.json b/dist/azure/gitversion/setup/task.json index 511c2996d..ed65e9305 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 6.0.x or exact version like 6.0.0" + "helpMarkDown": "Required version in the form of 6.1.x or exact version like 6.0.0" }, { "name": "includePrerelease", diff --git a/docs/examples/azure/gitversion/command.md b/docs/examples/azure/gitversion/command.md index bc154b086..49ffe7be9 100644 --- a/docs/examples/azure/gitversion/command.md +++ b/docs/examples/azure/gitversion/command.md @@ -13,7 +13,7 @@ steps: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' ``` These steps are omitted from the examples for brevity. diff --git a/docs/examples/azure/gitversion/execute.md b/docs/examples/azure/gitversion/execute.md index 8e1dcbdf1..e9aa6c11b 100644 --- a/docs/examples/azure/gitversion/execute.md +++ b/docs/examples/azure/gitversion/execute.md @@ -13,7 +13,7 @@ steps: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' ``` These steps are omitted from the examples for brevity. @@ -253,7 +253,7 @@ jobs: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - task: gitversion/execute@3.1.1 displayName: Determine Version @@ -323,7 +323,7 @@ jobs: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - task: gitversion/execute@3.1.1 displayName: Determine Version @@ -414,7 +414,7 @@ stages: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - task: gitversion/execute@3.1.1 displayName: Determine Version diff --git a/docs/examples/azure/gitversion/setup.md b/docs/examples/azure/gitversion/setup.md index bea88a96e..3ce298489 100644 --- a/docs/examples/azure/gitversion/setup.md +++ b/docs/examples/azure/gitversion/setup.md @@ -10,7 +10,7 @@ The Setup GitVersion task accepts the following inputs: ```yaml versionSpec: - description: Required version in the form of 6.0.x or exact version like 6.0.0. + description: Required version in the form of 6.1.x or exact version like 6.0.0. required: true default: '' includePrerelease: @@ -48,7 +48,7 @@ steps: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' ``` ### Example 2 @@ -72,7 +72,7 @@ steps: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' includePrerelease: true ``` @@ -85,6 +85,6 @@ steps: - task: gitversion/setup@3.1.1 displayName: Install GitVersion inputs: - versionSpec: '6.0.x' + versionSpec: '6.1.x' preferLatestVersion: true ``` diff --git a/docs/examples/github/gitversion/command.md b/docs/examples/github/gitversion/command.md index 86f8763b1..2b5c53580 100644 --- a/docs/examples/github/gitversion/command.md +++ b/docs/examples/github/gitversion/command.md @@ -15,7 +15,7 @@ steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' ``` These steps are omitted from the examples for brevity. diff --git a/docs/examples/github/gitversion/execute.md b/docs/examples/github/gitversion/execute.md index 9c93e269a..e813ecdac 100644 --- a/docs/examples/github/gitversion/execute.md +++ b/docs/examples/github/gitversion/execute.md @@ -15,7 +15,7 @@ steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' ``` These steps are omitted from the examples for brevity. @@ -248,7 +248,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - name: Determine Version id: version_step # step id used as reference for output values @@ -338,7 +338,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' - name: Determine Version id: version_step # step id used as reference for output values diff --git a/docs/examples/github/gitversion/setup.md b/docs/examples/github/gitversion/setup.md index 58d3849c3..6b3d8dbf3 100644 --- a/docs/examples/github/gitversion/setup.md +++ b/docs/examples/github/gitversion/setup.md @@ -10,7 +10,7 @@ The Setup GitVersion action accepts the following inputs: ```yaml versionSpec: - description: Required version in the form of 6.0.x or exact version like 6.0.0. + description: Required version in the form of 6.1.x or exact version like 6.0.0. required: true default: '' includePrerelease: @@ -47,7 +47,7 @@ steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' ``` ### Example 2 @@ -71,7 +71,7 @@ steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' includePrerelease: true ``` @@ -84,6 +84,6 @@ steps: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.1 with: - versionSpec: '6.0.x' + versionSpec: '6.1.x' preferLatestVersion: true ``` diff --git a/docs/versions.md b/docs/versions.md index b3ebf4712..fc8d7cb98 100644 --- a/docs/versions.md +++ b/docs/versions.md @@ -5,3 +5,4 @@ | v1.x | `>=5.2.0 <6.1.0` | `>=0.10.0 <0.18.0` | `>=0.10.0 <0.20.0` | 2.220.0 | | v2.x | `>=5.2.0 <6.1.0` | `>=0.10.0 <0.20.0` | `>=0.20.0` | 3.224.0 | | v3.x | `>=5.2.0 <6.1.0` | `>=0.18.0 <0.20.0` | `>=0.20.0` | 3.224.0 | +| v4.x | `>=6.1.0 <7.0.0` | `>=0.18.0 <0.20.0` | `>=0.20.0` | 3.224.0 | diff --git a/envs/gitversion/setup/azure.env b/envs/gitversion/setup/azure.env index 539fcfc97..63ba74d5b 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=6.0.x +INPUT_VERSIONSPEC=6.1.x diff --git a/envs/gitversion/setup/github.env b/envs/gitversion/setup/github.env index dc6fdf7e8..26de299ec 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=6.0.x +INPUT_VERSIONSPEC=6.1.x diff --git a/envs/gitversion/setup/local.env b/envs/gitversion/setup/local.env index 5961d31d7..5fbb5e534 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=6.0.x +INPUT_VERSIONSPEC=6.1.x diff --git a/gitversion/setup/action.yml b/gitversion/setup/action.yml index 3cf09aabc..219aad1d5 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 6.0.x or exact version like 6.0.0 + description: Required version in the form of 6.1.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 9310d1dbe..b6574bc08 100644 --- a/src/__tests__/tools/common/settings.spec.ts +++ b/src/__tests__/tools/common/settings.spec.ts @@ -6,7 +6,7 @@ import { expectValidSettings } from './utils' describe('SettingsProvider', () => { it('should return SetupSettings', () => { const settings: SetupSettings = { - versionSpec: '6.0.x', + versionSpec: '6.1.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 1a99507c7..a422678c9 100644 --- a/src/__tests__/tools/gitversion/runner.spec.ts +++ b/src/__tests__/tools/gitversion/runner.spec.ts @@ -16,7 +16,7 @@ describe('GitVersion Runner', () => { const toolPathVariable = 'GITVERSION_PATH' const toolName = 'dotnet-gitversion' - const versionSpec = '6.0.x' + const versionSpec = '6.1.x' function testOnAgent(agent: IBuildAgent): void { let version: string