From 570de8f1100a54b154ced9e197fab36cbec58442 Mon Sep 17 00:00:00 2001
From: Tigger Kindel <tig@users.noreply.github.com>
Date: Wed, 7 Jun 2023 09:51:11 -0600
Subject: [PATCH] Trying to get gitversion to do what I want

---
 .github/GitVersion.yml        | 5 +++++
 .github/workflows/publish.yml | 2 ++
 Release.ps1                   | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 .github/GitVersion.yml

diff --git a/.github/GitVersion.yml b/.github/GitVersion.yml
new file mode 100644
index 000000000..f176033e2
--- /dev/null
+++ b/.github/GitVersion.yml
@@ -0,0 +1,5 @@
+branches: 
+  master:
+    tag: ''
+  v2_develop:
+    tag: 'alpha'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c2ff660cb..949ab2416 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,6 +22,8 @@ jobs:
 
     - name: Determine Version
       uses: gittools/actions/gitversion/execute@v0
+      with:
+        useConfigFile: true      
       id: gitversion # step id used as reference for output values
 
     - name: Display GitVersion outputs
diff --git a/Release.ps1 b/Release.ps1
index 8b71f5522..d1c43afb1 100644
--- a/Release.ps1
+++ b/Release.ps1
@@ -14,12 +14,12 @@ try {
     Write-Host "Pulling latest from upstream branch $branch"
     git pull upstream $branch
 
-    Write-Host "Tagging release with tag $tag"
-    git tag $tag -a -m $releaseMessage
-
     Write-Host "Creating empty commit with message $releaseMessage"
     git commit --allow-empty -m $releaseMessage
 
+    Write-Host "Tagging release with tag $tag"
+    git tag $tag -a -m $releaseMessage
+
     Write-Host "Pushing changes to upstream"
     git push --atomic upstream $branch $tag
 } catch {