Refactor GitVersion Usage (#663)

- Update GitVersion extension
- Refactor config

GitVersion.yml

@@ -5,36 +5,9 @@ assembly-file-versioning-scheme: MajorMinorPatch
 ignore:
   sha: []
 branches:
-  master:
-    regex: ^master$|^main$
-    tag: ''
-    increment: Patch
-    prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
-    tracks-release-branches: false
+  main:
     is-release-branch: true
-  pull-request:
-    regex: ^(pull|pull\-requests|pr)[/-]
-    tag: pr
-    increment: Inherit
-    prevent-increment-of-merged-branch-version: false
-    tag-number-pattern: '[/-](?<number>\d+)[-/]'
-    track-merge-target: false
-    tracks-release-branches: false
-    is-release-branch: false
-  hotfix:
-    regex: ^hotfix(es)?[/-]
-    tag: useBranchName
-    increment: Patch
-    prevent-increment-of-merged-branch-version: false
-    track-merge-target: false
-    tracks-release-branches: false
-    is-release-branch: false
   feature:
-    regex: ^(personal|dev|feature|dependabot|auto\-nuget\-update)[/-]
+    regex: ^(dependabot|dev|feature(s)?|personal|user(s)?)[/-]
+  hotfix:
     tag: useBranchName
-    increment: Patch
-    prevent-increment-of-merged-branch-version: false
-    track-merge-target: false
-    tracks-release-branches: false
-    is-release-branch: false

build/.vsts-ci.yml

@@ -28,11 +28,11 @@ stages:
   dependsOn:
   - UpdateVersion
   variables:
-    assemblySemVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemVer']]
-    assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemFileVer']]
-    informationalVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.informationalVersion']]
-    majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.majorMinorPatch']]
-    nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.nuGetVersion']]
+    assemblySemVer: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.AssemblySemVer']]
+    assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.AssemblySemFileVer']]
+    informationalVersion: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.InformationalVersion']]
+    majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.MajorMinorPatch']]
+    nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.SemVer']]
   jobs:
   - job: Windows
     pool:

build/.vsts-pr.yml

@@ -18,21 +18,21 @@ stages:
     steps:
     - template: ./update-semver.yml
     - powershell: |
-        $buildNumber = "$(GitVersion.semVer)" -replace "\.", ""
+        $buildNumber = "$(GitVersion.SemVer)" -replace "\.", ""
         Write-Host "##vso[build.updatebuildnumber]$buildNumber"
-        Write-Host "Updated  build number to '$buildNumber"
+        Write-Host "Updated build number to '$buildNumber'"
       name: SetBuildVersion
 
 - stage: BuildRunUnitTests
   displayName: 'Build and run unit tests'
   dependsOn:
   - UpdateVersion
   variables:
-    assemblySemVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemVer']]
-    assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemFileVer']]
-    informationalVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.informationalVersion']]
-    majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.majorMinorPatch']]
-    nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.nuGetVersion']]
+    assemblySemVer: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.AssemblySemVer']]
+    assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.AssemblySemFileVer']]
+    informationalVersion: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.InformationalVersion']]
+    majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.MajorMinorPatch']]
+    nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['DicomVersion.GitVersion.SemVer']]
   jobs:
   - job: Windows
     pool:

build/update-semver.yml

@@ -1,31 +1,15 @@
 steps:
-- task: UseDotNet@2
-  displayName: 'Use .NET Core sdk (for GitVersion)'
+- task: gitversion/setup@0
+  displayName: 'Setup GitVersion'
   inputs:
-    packageType: sdk
-    version: 2.1.x
-
-- task: GitVersion@5
-  displayName: 'GitVersion'
-  inputs:
-    configFilePath: '$(Build.SourcesDirectory)/GitVersion.yml'
+    versionSpec: '5.x'
 
-# Can set these: https://github.com/GitTools/actions/blob/master/gitversion/execute/action.yml
-- powershell: |
-    Write-Host "##vso[task.setvariable variable=semVer]$(GitVersion.semVer)"
-    Write-Host "##vso[task.setvariable variable=informationalVersion;isOutput=true]$(GitVersion.informationalVersion)"
-    Write-Host "##vso[task.setvariable variable=majorMinorPatch;isOutput=true]$(GitVersion.majorMinorPatch)"
-    Write-Host "##vso[task.setvariable variable=nuGetVersion;isOutput=true]$(GitVersion.semVer)"
-    Write-Host "##vso[task.setvariable variable=assemblySemVer;isOutput=true]$(GitVersion.assemblySemVer)"
-    Write-Host "##vso[task.setvariable variable=assemblySemFileVer;isOutput=true]$(GitVersion.assemblySemFileVer)"
-  name: SetVariablesFromGitVersion
+# All variables from the GitVersion task are prefixed by "GitVersion." (eg. GitVersion.SemVer)
+- task: gitversion/execute@0
+  name: 'DicomVersion'
+  displayName: 'Run GitVersion'
+  inputs:
+    configFilePath: 'GitVersion.yml'
+    targetPath: '$(Build.SourcesDirectory)'
+    useConfigFile: true
 
-- powershell: |
-    Write-Host '----------Variables to use for build----------'
-    Write-Host 'semVer: $(semVer)'
-    Write-Host 'informationalVersion: $(informationalVersion)'
-    Write-Host 'majorMinorPatch: $(majorMinorPatch)'
-    Write-Host 'assemblySemVer: $(assemblySemVer)'
-    Write-Host 'assemblySemFileVer: $(assemblySemFileVer)'
-    Write-Host 'nuGetVersion: $(nuGetVersion)'
-  name: PrintVariablesFromGitVersion