Merge branch 'master' into feature/add_support_for_emitting_vars_in_wix_format

Author: ruhullahshah

.editorconfig

@@ -0,0 +1,18 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[.yml]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -110,8 +110,23 @@ src/GitVersionTfsTask/*.js
 ####################
 # Cake
 ####################
-/tools
+tools/*
+!tools/packages.config
 /*.zip
 GitVersion.CommandLine/*/
 
-releaseArtifacts
+releaseArtifacts
+/ILMergeTemp
+.dotnet
+.cake
+artifacts
+/src/Docker/**/content
+/src/GitVersionTfsTask/GitVersionTask
+!src/GitVersionTfsTask/GitVersionTask/task.json
+/src/GitVersionTfsTask/GitVersionNetCoreTask
+!src/GitVersionTfsTask/GitVersionNetCoreTask/task.json
+/src/GitVersionTfsTask/*.vsix
+/src/GitVersionRubyGem/*.gem
+/src/GitVersionRubyGem/bin/lib
+/src/GitVersionRubyGem/bin/GitVersion.exe
+/src/GitVersionRubyGem/bin/LibGit2Sharp.dll.config

.travis.yml

@@ -1,15 +1,20 @@
 language: csharp
-sudo: false
+sudo: required
+dist: trusty
+dotnet: 2.1.503
 mono:
   - latest
 os:
   - linux
   - osx
 before_install:
   - git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
+  - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+  - git fetch origin
+  - bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh)
 script:
-  - ./build.sh
-cache:
-  directories:
-    - src/packages
-    - tools
+  - pwsh ./build.ps1 -script build.cake -target Default
+env:
+  global:
+    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

CONTRIBUTING.md

@@ -68,3 +68,29 @@ The last line is the most important. `AssertFullSemver` will run GitVersion and
 
 ## 6. Submit a pull request with the failing test
 Even better include the fix, but a failing test is a great start
+
+
+# Build / Release Process
+We use Cake for our build and deployment process. The way the build / release process is setup is:
+
+1) We build releasable artifacts on AppVeyor
+1) Login to AppVeyor
+1) Deploy the latest master build
+![docs/img/release-1-deploy.png](docs/img/release-1-deploy.png)
+1) Choose GitVersion release, when you press deploy it will create a *non-released* GitHub release, this *will not* create a Git tag. This step is so we can validate the release and release notes before pushing the button.
+![docs/img/release-2-deploy.png](docs/img/release-2-deploy.png)
+1) All the artifacts should upload nicely
+![docs/img/release-3-deploy.png](docs/img/release-3-deploy.png)
+1) Head over to GitHub releases, you should have a draft release, download a copy of the release notes
+![docs/img/release-4-deploy.png](docs/img/release-4-deploy.png)
+1) Edit the release and do the following:
+    1. Remove the build metadata from the tag and title (the + and everything after it)
+    2. Paste the downloaded release notes in, you can clean them up if you want otherwise there may be closed issues which were questions etc. 
+    3. Tick the pre-release box if it's pre-release
+    4. Press Publish
+1) Publishing tags (a git tag) the release commit, this will trigger another appveyor build which only builds tags, this build uses deploy.cake. It downloads the artifacts from that GitHub release, then performs the release
+
+## Docker
+It is a manual release step after the release now, first download the appropriate ZIP and put into a `releaseArtifacts` folder in the GitVersion repository, then run:
+
+`docker build . --build-arg GitVersionZip=GitVersion_<VERSION>.zip --tag gittools/gitversion`

Dockerfile

@@ -3,4 +3,6 @@ branches:
   master:
     tag: beta
 ignore:
-  sha: []
+  sha: 
+    - 0e77e2e16a136a1cd0f0474fe5710f617d508d81
+    - af73f6a349456f146a8d0a413de1331eddf61bc2

GitVersion.yml

@@ -1,26 +1,33 @@
 ![Icon][icon]
 
 # GitVersion
+
 Versioning when using git, solved. GitVersion looks at your git history and
 works out the [semantic version][semver] of the commit being built.
 
 [![Gitter][gitter-badge]][gitter]
 [![Build status][appveyor-badge]][appveyor]
 [![Build Status][travis-badge]][travis]
+[![Build Status][azure-pipeline-badge]][azure-pipeline]
+[![codecov][codecov-badge]][codecov]
 
-|                            |                Stable                     |                 Pre-release               |
-| -------------------------: | :---------------------------------------: | :---------------------------------------: |
-|                  **Docs**  |     [![Docs][docs-badge]][docs]           |    [![Docs][docs-pre-badge]][docs-pre]    |
-|        **GitHub Release**  | [![GitHub release][gh-rel-badge]][gh-rel] |                      -                    |
-|   **GitVersion.Portable**  | [![Chocolatey][choco-badge]][choco]       |   [![Chocolatey][choco-pre-badge]][choco] |
-|        **GitVersionTask**  |     [![NuGet][gvt-badge]][gvt]            |       [![NuGet][gvt-pre-badge]][gvt]      |
-| **GitVersion.CommandLine** |     [![NuGet][gvc-badge]][gvc]            |       [![NuGet][gvc-pre-badge]][gvc]      |
-|                    **Gem** |       [![Gem][gem-badge]][gem]            |                      -                    |
-|               **Homebrew** |   [![homebrew][brew-badge]][brew]         |                      -                    |
-|               **Docker**   |   [gittools/gitversion][dockerhub]        |                      -                    |
+|                                       |                Stable                     |                 Pre-release               |
+| ------------------------------------: | :---------------------------------------: | :---------------------------------------: |
+|                              **Docs** |     [![Docs][docs-badge]][docs]           |    [![Docs][docs-pre-badge]][docs-pre]    |
+|                    **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] |                      -                    |
+|               **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco]       |   [![Chocolatey][choco-pre-badge]][choco] |
+|                    **GitVersionCore** |     [![NuGet][gvc-badge]][gvc]            |       [![NuGet][gvc-pre-badge]][gvc]      |
+|                    **GitVersionTask** |     [![NuGet][gvt-badge]][gvt]            |       [![NuGet][gvt-pre-badge]][gvt]      |
+|            **GitVersion.CommandLine** |     [![NuGet][gvcl-badge]][gvcl]          |       [![NuGet][gvcl-pre-badge]][gvcl]    |
+| **GitVersion.CommandLine.DotNetCore** |     [![NuGet][gvcd-badge]][gvcd]          |       [![NuGet][gvcd-pre-badge]][gvcd]    |
+|                   **GitVersion.Tool** |     [![NuGet][gvgt-badge]][gvgt]          |       [![NuGet][gvgt-pre-badge]][gvgt]    |
+|                               **Gem** |       [![Gem][gem-badge]][gem]            |                      -                    |
+|                          **Homebrew** |   [![homebrew][brew-badge]][brew]         |                      -                    |
+|                 **Docker DotnetCore** |   [Dotnetcore][dockerhub-dotnetcore]      |                      -                    |
+|                     **Docker FullFX** |   [FullFX][dockerhub-fullfx]              |                      -                    |
 
 ## Compatibility
-GitVersion works on Mac, Linux with Mono and Windows.
+GitVersion works Windows, Linux, and Mac.
 
 Tip: If you get `System.TypeInitializationException: The type initializer for
 'LibGit2Sharp.Core.NativeMethods' threw an exception. --->
@@ -29,60 +36,77 @@ System.DllNotFoundException: lib/linux/x86_64/libgit2-baa87df.so`
 You likely need to install `libcurl3`. Run `sudo apt-get install libcurl3`
 
 ## Quick Links
- - [Documentation][docs]
- - [Contributing][contribute]
- - [Why GitVersion][why]
- - [Usage][usage]
- - [How it works][how]
- - [FAQ][faq]
- - [Who is using GitVersion][who]
+
+- [Documentation][docs]
+- [Contributing][contribute]
+- [Why GitVersion][why]
+- [Usage][usage]
+- [How it works][how]
+- [FAQ][faq]
+- [Who is using GitVersion][who]
 
 ## GitVersion in action!
+
 ![README][gv-in-action]
 
 You are seeing:
 
- - Pull requests being built as pre-release builds
- - A branch called `release-1.0.0` producing beta v1 packages
+- Pull requests being built as pre-release builds
+- A branch called `release-1.0.0` producing beta v1 packages
 
 ## Icon
+
 <a href="http://thenounproject.com/noun/tree/#icon-No13389"
 target="_blank">Tree</a> designed by <a
 href="http://thenounproject.com/david.chapman" target="_blank">David Chapman</a>
 from The Noun Project
 
-[icon]:            https://raw.github.com/GitTools/GitVersion/master/docs/img/package_icon.png
-[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/master
-[appveyor-badge]:  https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/master?svg=true
-[travis]:          https://travis-ci.org/GitTools/GitVersion
-[travis-badge]:    https://travis-ci.org/GitTools/GitVersion.svg?branch=master
-[docs]:            http://gitversion.readthedocs.org/en/stable/
-[docs-badge]:      https://readthedocs.org/projects/gitversion/badge/?version=stable
-[docs-pre]:        http://gitversion.readthedocs.org/en/latest/
-[docs-pre-badge]:  https://readthedocs.org/projects/gitversion/badge/?version=latest
-[gh-rel]:          https://github.com/GitTools/GitVersion/releases/latest
-[gh-rel-badge]:    https://img.shields.io/github/release/gittools/gitversion.svg
-[choco]:           https://chocolatey.org/packages/GitVersion.Portable
-[choco-badge]:     https://img.shields.io/chocolatey/v/gitversion.portable.svg
-[choco-pre-badge]: https://img.shields.io/chocolatey/vpre/gitversion.portable.svg
-[gvt]:             https://www.nuget.org/packages/GitVersionTask
-[gvt-badge]:       https://img.shields.io/nuget/v/GitVersionTask.svg
-[gvt-pre-badge]:   https://img.shields.io/nuget/vpre/GitVersionTask.svg
-[gvc]:             https://www.nuget.org/packages/GitVersion.CommandLine
-[gvc-badge]:       https://img.shields.io/nuget/v/GitVersion.CommandLine.svg
-[gvc-pre-badge]:   https://img.shields.io/nuget/vpre/GitVersion.CommandLine.svg
-[gem-badge]:       https://img.shields.io/gem/v/gitversion.svg
-[gem]:             https://rubygems.org/gems/gitversion
-[brew]:            http://brew.sh/
-[brew-badge]:      https://img.shields.io/homebrew/v/gitversion.svg
-[contribute]:      https://github.com/GitTools/GitVersion/blob/master/CONTRIBUTING.md
-[why]:             http://gitversion.readthedocs.org/en/latest/why
-[usage]:           http://gitversion.readthedocs.org/en/latest/usage/usage/
-[how]:             http://gitversion.readthedocs.org/en/latest/more-info/how-it-works/
-[faq]:             http://gitversion.readthedocs.org/en/latest/faq/
-[who]:             http://gitversion.readthedocs.org/en/latest/who/
-[gv-in-action]:    https://raw.github.com/GitTools/GitVersion/master/docs/img/README.png
-[dockerhub]:       https://hub.docker.com/r/gittools/gitversion/
+[icon]:                 https://raw.github.com/GitTools/GitVersion/master/docs/img/package_icon.png
+[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/master
+[appveyor-badge]:       https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/master?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
+[travis]:               https://travis-ci.org/GitTools/GitVersion
+[travis-badge]:         https://travis-ci.org/GitTools/GitVersion.svg?branch=master
+[codecov]:              https://codecov.io/gh/GitTools/GitVersion
+[codecov-badge]:        https://codecov.io/gh/GitTools/GitVersion/branch/master/graph/badge.svg
+[docs]:                 http://gitversion.readthedocs.org/en/stable/
+[docs-badge]:           https://readthedocs.org/projects/gitversion/badge/?version=stable
+[docs-pre]:             http://gitversion.readthedocs.org/en/latest/
+[docs-pre-badge]:       https://readthedocs.org/projects/gitversion/badge/?version=latest
+[gh-rel]:               https://github.com/GitTools/GitVersion/releases/latest
+[gh-rel-badge]:         https://img.shields.io/github/release/gittools/gitversion.svg
+[choco]:                https://chocolatey.org/packages/GitVersion.Portable
+[choco-badge]:          https://img.shields.io/chocolatey/v/gitversion.portable.svg
+[choco-pre-badge]:      https://img.shields.io/chocolatey/vpre/gitversion.portable.svg
+[gvc]:                  https://www.nuget.org/packages/GitVersionCore
+[gvc-badge]:            https://img.shields.io/nuget/v/GitVersionCore.svg
+[gvc-pre-badge]:        https://img.shields.io/nuget/vpre/GitVersionCore.svg
+[gvt]:                  https://www.nuget.org/packages/GitVersionTask
+[gvt-badge]:            https://img.shields.io/nuget/v/GitVersionTask.svg
+[gvt-pre-badge]:        https://img.shields.io/nuget/vpre/GitVersionTask.svg
+[gvcl]:                 https://www.nuget.org/packages/GitVersion.CommandLine
+[gvcl-badge]:           https://img.shields.io/nuget/v/GitVersion.CommandLine.svg
+[gvcl-pre-badge]:       https://img.shields.io/nuget/vpre/GitVersion.CommandLine.svg
+[gvcd]:                 https://www.nuget.org/packages/GitVersion.CommandLine.DotNetCore
+[gvcd-badge]:           https://img.shields.io/nuget/v/GitVersion.CommandLine.DotNetCore.svg
+[gvcd-pre-badge]:       https://img.shields.io/nuget/vpre/GitVersion.CommandLine.DotNetCore.svg
+[gvgt]:                 https://www.nuget.org/packages/GitVersion.Tool
+[gvgt-badge]:           https://img.shields.io/nuget/v/GitVersion.Tool.svg
+[gvgt-pre-badge]:       https://img.shields.io/nuget/vpre/GitVersion.Tool.svg
+[gem-badge]:            https://img.shields.io/gem/v/gitversion.svg
+[gem]:                  https://rubygems.org/gems/gitversion
+[brew]:                 http://brew.sh/
+[brew-badge]:           https://img.shields.io/homebrew/v/gitversion.svg
+[contribute]:           https://github.com/GitTools/GitVersion/blob/master/CONTRIBUTING.md
+[why]:                  http://gitversion.readthedocs.org/en/latest/why
+[usage]:                http://gitversion.readthedocs.org/en/latest/usage/usage/
+[how]:                  http://gitversion.readthedocs.org/en/latest/more-info/how-it-works/
+[faq]:                  http://gitversion.readthedocs.org/en/latest/faq/
+[who]:                  http://gitversion.readthedocs.org/en/latest/who/
+[gv-in-action]:         https://raw.github.com/GitTools/GitVersion/master/docs/img/README.png
+[dockerhub-fullfx]:     https://hub.docker.com/r/gittools/gitversion-fullfx/
+[dockerhub-dotnetcore]: https://hub.docker.com/r/gittools/gitversion-dotnetcore/

README.md

@@ -1,17 +1,15 @@
-install:
-  npm i -g tfx-cli
+image: Visual Studio 2017
 
 assembly_info:
   patch: false
 
 configuration:
   - Debug
+install:
+  - set PATH=C:\Ruby25-x64\bin;%PATH%
 
 build_script:
-  - ps: .\build.ps1
+  - pwsh: ./build.ps1 -script build.cake -target Default
 
 test: off
 skip_tags: true
-
-cache:
-  - src\packages -> **\packages.config  # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

appveyor.deploy.yml

@@ -0,0 +1,21 @@
+variables:
+  DOTNET_SDK_VERSION: '2.1.503'
+  DOTNET_PACKAGE_TYPE: 'sdk'
+  RUBY_VERSION: '2.5'
+
+jobs:
+- template: build/tmpl/jobs.yml
+  parameters:
+    name: macOS
+    vmImage: 'macOS 10.13'
+    installRuby: 'false'
+
+- template: build/tmpl/jobs.yml
+  parameters:
+    name: Linux
+    vmImage: 'Ubuntu 16.04'
+
+- template: build/tmpl/jobs.yml
+  parameters:
+    name: Windows
+    vmImage: 'VS2017-Win2016'