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
GitTools · Oct 18, 2021 · 86d67b8 · 86d67b8
2 parents c2be8de + db23e17
commit 86d67b8
Show file tree

Hide file tree

Showing 533 changed files with 24,171 additions and 25,245 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -21,7 +21,7 @@ dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
 
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = true:warning
+dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,6 +48,12 @@ jobs:
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -83,6 +89,12 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Build]'
       shell: pwsh
@@ -110,7 +122,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net5.0, netcoreapp3.1]
+        targetFramework: [net5.0, net6.0, netcoreapp3.1]
       fail-fast: false
 
     steps:
@@ -134,6 +146,12 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Build]'
       shell: pwsh
@@ -175,6 +193,12 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Test Artifacts]'
       shell: pwsh
@@ -186,8 +210,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0' ]
-        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 ]
+        targetFramework: [ '3.1', '5.0', '6.0' ]
+        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 ]
       fail-fast: false
 
     steps:
@@ -224,18 +248,36 @@ jobs:
         name: native-${{ runner.os }}
         path: ${{ github.workspace }}/artifacts/packages/native
     -
-      name: '[Test Artifacts]'
+      name: Setup QEMU
+      uses: docker/setup-qemu-action@v1
+    -
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+      with:
+        install: true
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
+    -
+      name: '[Test Artifacts (amd64)]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=ArtifactsTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --verbosity=diagnostic
+    -
+      name: '[Test Artifacts (arm64)]'
+      shell: pwsh
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
 
   docker_linux_images:
     name: Build, Test and Publish Docker Images
     needs: [build]
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0' ]
-        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 ]
+        targetFramework: [ '3.1', '5.0', '6.0' ]
+        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 ]
       fail-fast: false
 
     steps:
@@ -266,17 +308,19 @@ jobs:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
-      name: Set up QEMU
+      name: Setup QEMU
       uses: docker/setup-qemu-action@v1
     -
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
       with:
         install: true
     -
-      name: '[Docker Build/Test] DockerHub'
-      shell: pwsh
-      run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: Login to DockerHub
       if: success() && github.event_name != 'pull_request'
@@ -285,28 +329,44 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
     -
-      name: '[Docker Publish] DockerHub'
+      name: '[Docker Build/Test/Publish (amd64)] DockerHub'
       if: success() && github.event_name != 'pull_request'
       shell: pwsh
-      run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+      run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+    -
+      name: '[Docker Build/Test/Publish (arm64)] DockerHub'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+    -
+      name: '[Docker Publish Manifest] DockerHub'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
 
-    # -
-    #   name: '[Docker Build/Test] GitHub Container Registry'
-    #   shell: pwsh
-    #   run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
-    # -
-    #   name: Login to GitHub Container Registry
-    #   if: success() && github.event_name != 'pull_request'
-    #   uses: docker/login-action@v1
-    #   with:
-    #       registry: ghcr.io
-    #       username: ${{ github.repository_owner }}
-    #       password: ${{ secrets.GITHUB_TOKEN }}
-    # -
-    #   name: '[Docker Publish] GitHub Container Registry'
-    #   if: success() && github.event_name != 'pull_request'
-    #   shell: pwsh
-    #   run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+    -
+      name: Login to GitHub Container Registry
+      if: success() && github.event_name != 'pull_request'
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
+    -
+      name: '[Docker Build/Test/Publish (amd64)] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+    -
+      name: '[Docker Build/Test/Publish (arm64)] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+    -
+      name: '[Docker Publish Manifest] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
 
   publish:
     name: Publish
@@ -347,6 +407,12 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Publish]'
       shell: pwsh
@@ -397,6 +463,12 @@ jobs:
       with:
         name: native-macOS
         path: ${{ github.workspace }}/artifacts/packages/native
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Release]'
       shell: pwsh

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -29,16 +29,52 @@ jobs:
         language: [ 'csharp' ]
 
     steps:
-    - name: Checkout repository
+    -
+      name: Checkout repository
       uses: actions/checkout@v2.3.4
+    -
+      name: Fetch all history for all tags and branches
+      run: git fetch --prune --unshallow
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+    -
+      name: Cache cake frosting
+      id: cache-cake
+      uses: actions/cache@v2.1.6
+      with:
+        path: run
+        key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
+
+    -
+      name: Install .NET Core SDK 3.1.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+
+    -
+      name: Install .NET SDK 5.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.x'
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
+    -
+      name: '[Prepare]'
+      if: steps.cache-cake.outputs.cache-hit != 'true'
+      run: dotnet build build/CI.sln --configuration=Release
+
+    -
+      name: '[Build]'
+      shell: pwsh
+      run: dotnet run/build.dll --target=Build
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -79,7 +79,7 @@ jobs:
         arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
     -
       name: '[Remark Lint]'
-      uses: reviewdog/action-remark-lint@v3
+      uses: reviewdog/action-remark-lint@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         reporter: github-pr-check

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -23,5 +23,15 @@ jobs:
     name: DotNet Format
     steps:
       - uses: actions/checkout@v2.3.4
-      - run: dotnet tool restore
-      - run: dotnet format ./ --folder --check --exclude **/AddFormats/
+      -
+        name: Setup .NET SDK
+        uses: actions/setup-dotnet@v1.8.2
+        with:
+          dotnet-version: '6.0.x'
+          include-prerelease: true
+      -
+        name: Run Format Build solution
+        run: dotnet format ./build/ --verify-no-changes
+      -
+        name: Run Format GitVersion solution
+        run: dotnet format ./src/ --exclude **/AddFormats/ --verify-no-changes
diff --git a/README.md b/README.md
@@ -52,14 +52,10 @@ from The Noun Project.
 [semver]:                          http://semver.org
 [gitter]:                          https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 [gitter-badge]:                    https://badges.gitter.im/Join+Chat.svg
-[appveyor]:                        https://ci.appveyor.com/project/GitTools/gitversion/branch/main
-[appveyor-badge]:                  https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/main?svg=true
 [azure-pipeline]:                  https://dev.azure.com/GitTools/GitVersion/_build/latest?definitionId=1
 [azure-pipeline-badge]:            https://dev.azure.com/GitTools/GitVersion/_apis/build/status/GitTools.GitVersion
 [github-actions]:                  https://github.com/GitTools/GitVersion/actions
 [github-actions-badge]:            https://github.com/GitTools/GitVersion/workflows/Build/badge.svg
-[travis]:                          https://travis-ci.org/GitTools/GitVersion
-[travis-badge]:                    https://travis-ci.org/GitTools/GitVersion.svg?branch=main
 [codecov]:                         https://codecov.io/gh/GitTools/GitVersion
 [codecov-badge]:                   https://codecov.io/gh/GitTools/GitVersion/branch/main/graph/badge.svg
 [docs]:                            https://gitversion.net/docs/

diff --git a/build/.run/ArtifactsDotnetToolTest.run.xml → build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/ArtifactsDotnetToolTest.run.xml → build/.run/Artifacts DotnetTool Test.run.xml
@@ -1,7 +1,7 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>

diff --git a/build/.run/Artifacts Executable Test.run.xml b/build/.run/Artifacts Executable Test.run.xml
@@ -1,6 +1,6 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Executable Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsExecutableTest" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
diff --git a/build/.run/ArtifactsMsBuildCoreTest.run.xml → ...d/.run/Artifacts MsBuildCore Test.run.xml b/build/.run/ArtifactsMsBuildCoreTest.run.xml → ...d/.run/Artifacts MsBuildCore Test.run.xml
@@ -1,7 +1,7 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>