Merge branch 'master' into feature/lockfile

Author: dieterv

.azurepipelines/artifacts-linux-test.yml

@@ -0,0 +1,13 @@
+jobs:
+- ${{ each distro in parameters.distros }}:
+    - ${{ each dotnetVersion in parameters.dotnetVersions }}:
+      - job:
+        displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
+        pool:
+          vmImage: ${{ parameters.vmImage }}
+        steps:
+        - template: common-steps.yml
+          parameters:
+            includeArtifacts: true
+        - pwsh: ./build.ps1 -target Artifacts-Test -DockerDistro ${{ distro }} -DockerDotnetVersion ${{ dotnetVersion }}
+          displayName: '[Docker Test Artifacts ${{ distro }}_${{ dotnetVersion }}]'

.azurepipelines/artifacts-test.yml renamed to .azurepipelines/artifacts-windows-test.yml

@@ -1,16 +1,4 @@
 jobs:
-- ${{ each distro in parameters.distros }}:
-    - ${{ each dotnetVersion in parameters.dotnetVersions }}:
-      - job:
-        displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
-        pool:
-          vmImage: ${{ parameters.vmImage }}
-        steps:
-        - template: common-steps.yml
-          parameters:
-            includeArtifacts: true
-        - pwsh: ./build.ps1 -target Artifacts-Test -DockerDistro ${{ distro }} -DockerDotnetVersion ${{ dotnetVersion }}
-          displayName: '[Docker Test Artifacts ${{ distro }}_${{ dotnetVersion }}]'
 - job: Artifacts_Test_MsBuild
   displayName: Artifacts Test MsBuild (Windows)
   pool:
@@ -40,4 +28,4 @@ jobs:
     parameters:
       includeArtifacts: true
   - pwsh: ./build.ps1 -target Artifacts-Portable-Test
-    displayName: '[Portable Test Artifacts]'
+    displayName: '[Portable Test Artifacts]'

.config/dotnet-tools.json

@@ -3,10 +3,10 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.37.0",
+      "version": "1.0.0-rc0002",
       "commands": [
         "dotnet-cake"
       ]
     }
   }
-}
+}

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -96,15 +96,15 @@ jobs:
       shell: pwsh
       run: ./build.ps1 -target Test
 
-  artifact_test:
-    name: Artifacts Test
+  artifact_linux_test:
+    name: Artifacts Linux Test
     needs: [build, test]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         os: [linux]
-        targetFramework: [3.1]
-        distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
+        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 ]
       fail-fast: false
 
     steps:
@@ -225,16 +225,16 @@ jobs:
 
   docker:
     name: Docker
-    needs: [artifact_test, artifact_msbuild_test, artifact_commandline_test, artifact_portable_test]
+    needs: [artifact_linux_test, artifact_msbuild_test, artifact_commandline_test, artifact_portable_test]
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     strategy:
       matrix:
         os: [linux]
-        targetFramework: [3.1]
-        distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
+        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 ]
       fail-fast: false
 
     steps:
@@ -265,7 +265,7 @@ jobs:
 
   publish:
     name: Publish
-    needs: [artifact_test]
+    needs: [artifact_linux_test, artifact_msbuild_test, artifact_commandline_test, artifact_portable_test]
     runs-on: windows-latest
     strategy:
       matrix:

.github/workflows/format.yml

@@ -1,18 +1,21 @@
-name: Validate PR
+name: Validate Commit
 
-on: [pull_request]
+on:
+  push:
+    branches:
+    - master
+    - 'fix/*'
+    - 'feature/*'
+
+  pull_request:
+    branches:
+    - master
 
 jobs:
   format:
     runs-on: ubuntu-latest
     name: DotNet Format
     steps:
       - uses: actions/checkout@v2
-
-      # workaround for dotnet tools not being on path https://github.com/actions/virtual-environments/issues/213
-      - name: add .dotnet/tools to path
-        run: echo "::set-env name=PATH::${PATH}:${HOME}/.dotnet/tools"
-
       - run: dotnet tool install -g dotnet-format
-
       - run: dotnet format ./ --folder --check --exclude **/AddFormats/

.github/workflows/homebrew.yml

@@ -0,0 +1,17 @@
+name: Homebrew
+
+on:
+  repository_dispatch:
+    types: [release]
+jobs:
+  homebrew:
+    name: Bump Homebrew formula
+    runs-on: macos-latest
+    steps:
+    - uses: dawidd6/action-homebrew-bump-formula@v3
+      with:
+        # GitHub token, required, not the default one
+        token: ${{secrets.HOMEBREW_GITHUB_TOKEN}}
+        # Formula name, required
+        formula: gitversion
+        tag: ${{ github.event.client_payload.ref }}

.github/workflows/release.yml

@@ -4,17 +4,14 @@ on:
     types: [published]
 
 jobs:
-  callBuildFlow:
+  release:
     name: Trigger Build flow
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: octokit/[email protected]
-        name: "Trigger Build flow"
+      - uses: peter-evans/repository-dispatch@v1
         with:
-          route: POST /repos/:repository/dispatches
+          token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           repository: ${{ github.repository }}
-          mediaType: '{"previews": ["everest"]}'
-          event_type: release
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+          event-type: release
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

README.md

@@ -1,15 +1,11 @@
-<h1>
-    <img src="docs/input/docs/img/package_icon.svg" alt="Tree" height="100">
-    GitVersion
-</h1>
+![GitVersion – From git log to SemVer in no time][banner]
 
-Versioning when using git, solved. GitVersion looks at your git history and
-works out the [semantic version][semver] of the commit being built.
+Versioning when using Git, solved. GitVersion looks at your git history and
+works out the [Semantic Version][semver] of the commit being built.
 
 [![Build status][appveyor-badge]][appveyor]
 [![Build status][azure-pipeline-badge]][azure-pipeline]
 [![Build status][github-actions-badge]][github-actions]
-
 [![codecov][codecov-badge]][codecov]
 [![Gitter][gitter-badge]][gitter]
 
@@ -19,7 +15,8 @@ works out the [semantic version][semver] of the commit being built.
 | **GitVersion.Portable**    |                     [![Chocolatey][choco-badge]][choco]            |
 | **GitVersion.Tool**        |                           [![NuGet][gvgt-badge]][gvgt]             |
 | **GitVersion.CommandLine** |                           [![NuGet][gvcl-badge]][gvcl]             |
-| **GitVersionTask**         |                            [![NuGet][gvt-badge]][gvt]              |
+| **GitVersion.MsBuild**     |                            [![NuGet][gvt-badge]][gvt]              |
+| **Homebrew**               |                        [![homebrew][brew-badge]][brew]             |
 | **Azure Pipeline Task**    | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
 | **Github Action**          |             [![Github Action][gh-actions-badge]][gh-actions]       |
 | **Docker**                 |               [![Docker Pulls][dockerhub-badge]][dockerhub]        |
@@ -28,12 +25,6 @@ works out the [semantic version][semver] of the commit being built.
 
 GitVersion works on Windows, Linux, and Mac.
 
-Tip: If you get `System.TypeInitializationException: The type initializer for
-'LibGit2Sharp.Core.NativeMethods' threw an exception. --->
-System.DllNotFoundException: lib/linux/x86_64/libgit2-baa87df.so` in versions prior to 5.0.0
-
-You likely need to install `libcurl3`. Run `sudo apt-get install libcurl3`
-
 ## Quick Links
 
 - [Documentation][docs]
@@ -77,24 +68,25 @@ from The Noun Project.
 [gh-rel-badge]:                    https://img.shields.io/github/release/gittools/gitversion.svg?logo=github
 [choco]:                           https://chocolatey.org/packages/GitVersion.Portable
 [choco-badge]:                     https://img.shields.io/chocolatey/v/gitversion.portable.svg?logo=nuget
-[gvt]:                             https://www.nuget.org/packages/GitVersionTask
-[gvt-badge]:                       https://img.shields.io/nuget/v/GitVersionTask.svg?logo=nuget
+[gvt]:                             https://www.nuget.org/packages/GitVersion.MsBuild
+[gvt-badge]:                       https://img.shields.io/nuget/v/GitVersion.MsBuild.svg?logo=nuget
 [gvcl]:                            https://www.nuget.org/packages/GitVersion.CommandLine
 [gvcl-badge]:                      https://img.shields.io/nuget/v/GitVersion.CommandLine.svg?logo=nuget
 [gvgt]:                            https://www.nuget.org/packages/GitVersion.Tool
 [gvgt-badge]:                      https://img.shields.io/nuget/v/GitVersion.Tool.svg?logo=nuget
-[brew]:                            http://brew.sh/
+[brew]:                            https://formulae.brew.sh/formula/gitversion
 [brew-badge]:                      https://img.shields.io/homebrew/v/gitversion.svg?logo=homebrew
 [dockerhub]:                       https://hub.docker.com/r/gittools/gitversion/
 [dockerhub-badge]:                 https://img.shields.io/docker/pulls/gittools/gitversion.svg?logo=docker
 [az-pipeline-task]:                https://marketplace.visualstudio.com/items?itemName=gittools.gittools
-[az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=visual-studio
-[gh-actions]:                      https://github.com/marketplace/actions/use-actions
-[gh-actions-badge]:                https://img.shields.io/badge/marketplace-use--actions-blue?logo=github
+[az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=azure-pipelines
+[gh-actions]:                      https://github.com/marketplace/actions/gittools
+[gh-actions-badge]:                https://img.shields.io/badge/marketplace-gittools-blue?logo=github
 [contribute]:                      https://github.com/GitTools/GitVersion/blob/master/CONTRIBUTING.md
 [why]:                             https://gitversion.net/docs/why
 [usage]:                           https://gitversion.net/docs/usage/usage
 [how]:                             https://gitversion.net/docs/more-info/how-it-works
 [faq]:                             https://gitversion.net/docs/faq
 [who]:                             https://gitversion.net/docs/who
 [gv-in-action]:                    https://raw.github.com/GitTools/GitVersion/master/docs/input/docs/img/README.png
+[banner]:                          https://github.com/GitTools/graphics/raw/master/GitVersion/banner-1280x640.png

azure-pipelines.yml

@@ -48,35 +48,48 @@ stages:
     steps:
     - template: .azurepipelines/test.yml
 
-- stage: Artifact_Test
-  displayName: 'Artifacts test'
+- stage: Artifact_Linux_Test
+  displayName: 'Artifacts Linux test'
   dependsOn:
   - Build
   - Test
   condition: succeeded()
   jobs:
-  - template: .azurepipelines/artifacts-test.yml
+  - template: .azurepipelines/artifacts-linux-test.yml
     parameters:
       name: Linux
       vmImage: 'ubuntu-latest'
-      distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
-      dotnetVersions: [ '3.1' ]
+      distros: [ 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 ]
+      dotnetVersions: [ '3.1', '5.0' ]
+
+- stage: Artifact_Windows_Test
+  displayName: 'Artifacts Windows test'
+  dependsOn:
+  - Build
+  - Test
+  condition: succeeded()
+  jobs:
+  - template: .azurepipelines/artifacts-windows-test.yml
 
 - stage: Docker
   displayName: 'Docker Build & Test'
-  dependsOn: Artifact_Test
+  dependsOn:
+  - Artifact_Linux_Test
+  - Artifact_Windows_Test
   condition: succeeded()
   jobs:
   - template: .azurepipelines/docker.yml
     parameters:
       name: Linux
       vmImage: 'ubuntu-latest'
-      distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
-      dotnetVersions: [ '3.1' ]
+      distros: [ 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 ]
+      dotnetVersions: [ '3.1', '5.0' ]
 
 - stage: Publish
   displayName: 'Publish'
-  dependsOn: Artifact_Test
+  dependsOn:
+  - Artifact_Linux_Test
+  - Artifact_Windows_Test
   condition: succeeded()
   jobs:
   - job: Publish