diff --git a/GitVersion.yml b/GitVersion.yml index c92669d..c43da7f 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -4,14 +4,18 @@ branches: master: tag: rc increment: Minor - features?[/-]: + feature: + regex: features?[/-] tag: rc-{BranchName} increment: Minor - (pull|pull\-requests|pr)[/-]: + pull-request: + regex: (pull|pull\-requests|pr)[/-] tag: rc-pr-{BranchName} increment: Minor - hotfix(es)?[/-]: + hotfix: + regex: hotfix(es)?[/-] tag: rc increment: Patch - dev(elop)?(ment)?$: + develop: + regex: dev(elop)?(ment)?$ tag: b \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 95e1683..d866813 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ configuration: Release install: - choco install gitversion.portable -y before_build: - - cmd: gitversion /l console /output buildserver /b %APPVEYOR_REPO_BRANCH% + - cmd: gitversion /l console /output buildserver - nuget restore build_script: msbuild /nologo /v:m /p:AssemblyVersion=%GitVersion_AssemblySemVer% /p:FileVersion=%GitVersion_MajorMinorPatch% /p:InformationalVersion=%GitVersion_InformationalVersion% /p:Configuration=%CONFIGURATION% S7.sln