Skip to content

Commit 86d67b8

Browse files
ni-fgenoisni-fgenois
committed
Merge branch 'main' of github.com:GitTools/GitVersion
# Conflicts: # src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs # src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs # src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs # src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs # src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
2 parents c2be8de + db23e17 commit 86d67b8

File tree

533 files changed

+24171
-25245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+24171
-25245
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dotnet_separate_import_directive_groups = false
2121
dotnet_sort_system_directives_first = true
2222

2323
# Avoid "this." and "Me." if not necessary
24-
dotnet_style_qualification_for_field = true:warning
24+
dotnet_style_qualification_for_field = false:silent
2525
dotnet_style_qualification_for_property = false:silent
2626
dotnet_style_qualification_for_method = false:silent
2727
dotnet_style_qualification_for_event = false:silent

‎.github/workflows/ci.yml

+102-30
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ jobs:
4848
with:
4949
path: run
5050
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
51+
-
52+
name: Install .NET SDK 6.0.x
53+
uses: actions/setup-dotnet@v1
54+
with:
55+
dotnet-version: '6.0.x'
56+
include-prerelease: true
5157
-
5258
name: '[Prepare]'
5359
if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -83,6 +89,12 @@ jobs:
8389
with:
8490
path: tools
8591
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
92+
-
93+
name: Install .NET SDK 6.0.x
94+
uses: actions/setup-dotnet@v1
95+
with:
96+
dotnet-version: '6.0.x'
97+
include-prerelease: true
8698
-
8799
name: '[Build]'
88100
shell: pwsh
@@ -110,7 +122,7 @@ jobs:
110122
strategy:
111123
matrix:
112124
os: [windows-latest, ubuntu-latest, macos-latest]
113-
targetFramework: [net5.0, netcoreapp3.1]
125+
targetFramework: [net5.0, net6.0, netcoreapp3.1]
114126
fail-fast: false
115127

116128
steps:
@@ -134,6 +146,12 @@ jobs:
134146
with:
135147
path: tools
136148
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
149+
-
150+
name: Install .NET SDK 6.0.x
151+
uses: actions/setup-dotnet@v1
152+
with:
153+
dotnet-version: '6.0.x'
154+
include-prerelease: true
137155
-
138156
name: '[Build]'
139157
shell: pwsh
@@ -175,6 +193,12 @@ jobs:
175193
with:
176194
name: nuget
177195
path: ${{ github.workspace }}/artifacts/packages/nuget
196+
-
197+
name: Install .NET SDK 6.0.x
198+
uses: actions/setup-dotnet@v1
199+
with:
200+
dotnet-version: '6.0.x'
201+
include-prerelease: true
178202
-
179203
name: '[Test Artifacts]'
180204
shell: pwsh
@@ -186,8 +210,8 @@ jobs:
186210
runs-on: ubuntu-latest
187211
strategy:
188212
matrix:
189-
targetFramework: [ '3.1', '5.0' ]
190-
distro: [ alpine.3.12-x64, centos.7-x64, centos.8-x64, debian.9-x64, debian.10-x64, fedora.33-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64 ]
213+
targetFramework: [ '3.1', '5.0', '6.0' ]
214+
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
191215
fail-fast: false
192216

193217
steps:
@@ -224,18 +248,36 @@ jobs:
224248
name: native-${{ runner.os }}
225249
path: ${{ github.workspace }}/artifacts/packages/native
226250
-
227-
name: '[Test Artifacts]'
251+
name: Setup QEMU
252+
uses: docker/setup-qemu-action@v1
253+
-
254+
name: Set up Docker Buildx
255+
uses: docker/setup-buildx-action@v1
256+
with:
257+
install: true
258+
-
259+
name: Install .NET SDK 6.0.x
260+
uses: actions/setup-dotnet@v1
261+
with:
262+
dotnet-version: '6.0.x'
263+
include-prerelease: true
264+
-
265+
name: '[Test Artifacts (amd64)]'
228266
shell: pwsh
229-
run: dotnet run/artifacts.dll --target=ArtifactsTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
267+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --verbosity=diagnostic
268+
-
269+
name: '[Test Artifacts (arm64)]'
270+
shell: pwsh
271+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
230272

231273
docker_linux_images:
232274
name: Build, Test and Publish Docker Images
233275
needs: [build]
234276
runs-on: ubuntu-latest
235277
strategy:
236278
matrix:
237-
targetFramework: [ '3.1', '5.0' ]
238-
distro: [ alpine.3.12-x64, centos.7-x64, centos.8-x64, debian.9-x64, debian.10-x64, fedora.33-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64 ]
279+
targetFramework: [ '3.1', '5.0', '6.0' ]
280+
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
239281
fail-fast: false
240282

241283
steps:
@@ -266,17 +308,19 @@ jobs:
266308
name: nuget
267309
path: ${{ github.workspace }}/artifacts/packages/nuget
268310
-
269-
name: Set up QEMU
311+
name: Setup QEMU
270312
uses: docker/setup-qemu-action@v1
271313
-
272314
name: Set up Docker Buildx
273315
uses: docker/setup-buildx-action@v1
274316
with:
275317
install: true
276318
-
277-
name: '[Docker Build/Test] DockerHub'
278-
shell: pwsh
279-
run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
319+
name: Install .NET SDK 6.0.x
320+
uses: actions/setup-dotnet@v1
321+
with:
322+
dotnet-version: '6.0.x'
323+
include-prerelease: true
280324
-
281325
name: Login to DockerHub
282326
if: success() && github.event_name != 'pull_request'
@@ -285,28 +329,44 @@ jobs:
285329
username: ${{ secrets.DOCKER_USERNAME }}
286330
password: ${{ secrets.DOCKER_PASSWORD }}
287331
-
288-
name: '[Docker Publish] DockerHub'
332+
name: '[Docker Build/Test/Publish (amd64)] DockerHub'
289333
if: success() && github.event_name != 'pull_request'
290334
shell: pwsh
291-
run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
335+
run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
336+
-
337+
name: '[Docker Build/Test/Publish (arm64)] DockerHub'
338+
if: success() && github.event_name != 'pull_request'
339+
shell: pwsh
340+
run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
341+
-
342+
name: '[Docker Publish Manifest] DockerHub'
343+
if: success() && github.event_name != 'pull_request'
344+
shell: pwsh
345+
run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
292346

293-
# -
294-
# name: '[Docker Build/Test] GitHub Container Registry'
295-
# shell: pwsh
296-
# run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
297-
# -
298-
# name: Login to GitHub Container Registry
299-
# if: success() && github.event_name != 'pull_request'
300-
# uses: docker/login-action@v1
301-
# with:
302-
# registry: ghcr.io
303-
# username: ${{ github.repository_owner }}
304-
# password: ${{ secrets.GITHUB_TOKEN }}
305-
# -
306-
# name: '[Docker Publish] GitHub Container Registry'
307-
# if: success() && github.event_name != 'pull_request'
308-
# shell: pwsh
309-
# run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
347+
-
348+
name: Login to GitHub Container Registry
349+
if: success() && github.event_name != 'pull_request'
350+
uses: docker/login-action@v1
351+
with:
352+
registry: ghcr.io
353+
username: ${{ github.repository_owner }}
354+
password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
355+
-
356+
name: '[Docker Build/Test/Publish (amd64)] GitHub Container Registry'
357+
if: success() && github.event_name != 'pull_request'
358+
shell: pwsh
359+
run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
360+
-
361+
name: '[Docker Build/Test/Publish (arm64)] GitHub Container Registry'
362+
if: success() && github.event_name != 'pull_request'
363+
shell: pwsh
364+
run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
365+
-
366+
name: '[Docker Publish Manifest] GitHub Container Registry'
367+
if: success() && github.event_name != 'pull_request'
368+
shell: pwsh
369+
run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
310370

311371
publish:
312372
name: Publish
@@ -347,6 +407,12 @@ jobs:
347407
with:
348408
name: nuget
349409
path: ${{ github.workspace }}/artifacts/packages/nuget
410+
-
411+
name: Install .NET SDK 6.0.x
412+
uses: actions/setup-dotnet@v1
413+
with:
414+
dotnet-version: '6.0.x'
415+
include-prerelease: true
350416
-
351417
name: '[Publish]'
352418
shell: pwsh
@@ -397,6 +463,12 @@ jobs:
397463
with:
398464
name: native-macOS
399465
path: ${{ github.workspace }}/artifacts/packages/native
466+
-
467+
name: Install .NET SDK 6.0.x
468+
uses: actions/setup-dotnet@v1
469+
with:
470+
dotnet-version: '6.0.x'
471+
include-prerelease: true
400472
-
401473
name: '[Release]'
402474
shell: pwsh

‎.github/workflows/codeql-analysis.yml

+39-3
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,52 @@ jobs:
2929
language: [ 'csharp' ]
3030

3131
steps:
32-
- name: Checkout repository
32+
-
33+
name: Checkout repository
3334
uses: actions/[email protected]
35+
-
36+
name: Fetch all history for all tags and branches
37+
run: git fetch --prune --unshallow
3438

3539
- name: Initialize CodeQL
3640
uses: github/codeql-action/init@v1
3741
with:
3842
languages: ${{ matrix.language }}
3943

40-
- name: Autobuild
41-
uses: github/codeql-action/autobuild@v1
44+
-
45+
name: Cache cake frosting
46+
id: cache-cake
47+
uses: actions/[email protected]
48+
with:
49+
path: run
50+
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
51+
52+
-
53+
name: Install .NET Core SDK 3.1.x
54+
uses: actions/setup-dotnet@v1
55+
with:
56+
dotnet-version: '3.1.x'
57+
58+
-
59+
name: Install .NET SDK 5.0.x
60+
uses: actions/setup-dotnet@v1
61+
with:
62+
dotnet-version: '5.0.x'
63+
-
64+
name: Install .NET SDK 6.0.x
65+
uses: actions/setup-dotnet@v1
66+
with:
67+
dotnet-version: '6.0.x'
68+
include-prerelease: true
69+
-
70+
name: '[Prepare]'
71+
if: steps.cache-cake.outputs.cache-hit != 'true'
72+
run: dotnet build build/CI.sln --configuration=Release
73+
74+
-
75+
name: '[Build]'
76+
shell: pwsh
77+
run: dotnet run/build.dll --target=Build
4278

4379
- name: Perform CodeQL Analysis
4480
uses: github/codeql-action/analyze@v1

‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
8080
-
8181
name: '[Remark Lint]'
82-
uses: reviewdog/action-remark-lint@v3
82+
uses: reviewdog/action-remark-lint@v4
8383
with:
8484
github_token: ${{ secrets.GITHUB_TOKEN }}
8585
reporter: github-pr-check

‎.github/workflows/format.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,15 @@ jobs:
2323
name: DotNet Format
2424
steps:
2525
- uses: actions/[email protected]
26-
- run: dotnet tool restore
27-
- run: dotnet format ./ --folder --check --exclude **/AddFormats/
26+
-
27+
name: Setup .NET SDK
28+
uses: actions/[email protected]
29+
with:
30+
dotnet-version: '6.0.x'
31+
include-prerelease: true
32+
-
33+
name: Run Format Build solution
34+
run: dotnet format ./build/ --verify-no-changes
35+
-
36+
name: Run Format GitVersion solution
37+
run: dotnet format ./src/ --exclude **/AddFormats/ --verify-no-changes

‎README.md

-4
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,10 @@ from The Noun Project.
5252
[semver]: http://semver.org
5353
[gitter]: https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
5454
[gitter-badge]: https://badges.gitter.im/Join+Chat.svg
55-
[appveyor]: https://ci.appveyor.com/project/GitTools/gitversion/branch/main
56-
[appveyor-badge]: https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/main?svg=true
5755
[azure-pipeline]: https://dev.azure.com/GitTools/GitVersion/_build/latest?definitionId=1
5856
[azure-pipeline-badge]: https://dev.azure.com/GitTools/GitVersion/_apis/build/status/GitTools.GitVersion
5957
[github-actions]: https://github.com/GitTools/GitVersion/actions
6058
[github-actions-badge]: https://github.com/GitTools/GitVersion/workflows/Build/badge.svg
61-
[travis]: https://travis-ci.org/GitTools/GitVersion
62-
[travis-badge]: https://travis-ci.org/GitTools/GitVersion.svg?branch=main
6359
[codecov]: https://codecov.io/gh/GitTools/GitVersion
6460
[codecov-badge]: https://codecov.io/gh/GitTools/GitVersion/branch/main/graph/badge.svg
6561
[docs]: https://gitversion.net/docs/

‎build/.run/ArtifactsDotnetToolTest.run.xml ‎build/.run/Artifacts DotnetTool Test.run.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<component name="ProjectRunConfigurationManager">
1+
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net5.0" />
15+
<option name="PROJECT_TFM" value="net6.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts Executable Test.run.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<component name="ProjectRunConfigurationManager">
1+
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts Executable Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
44
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsExecutableTest" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
@@ -12,9 +12,9 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net5.0" />
15+
<option name="PROJECT_TFM" value="net6.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>
1919
</configuration>
20-
</component>
20+
</component>

‎build/.run/ArtifactsMsBuildCoreTest.run.xml ‎build/.run/Artifacts MsBuildCore Test.run.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<component name="ProjectRunConfigurationManager">
1+
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=alpine.3.12-x64" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net5.0" />
15+
<option name="PROJECT_TFM" value="net6.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

0 commit comments

Comments
 (0)