From 4fd62e9184145db1f76f33ebc3762c782e7fcde5 Mon Sep 17 00:00:00 2001
From: Daan Boerlage <d@boerlage.me>
Date: Sun, 24 Jan 2021 22:20:59 +0100
Subject: [PATCH] Make sure that the build version suffix is not a number

---
 .gitlab-ci.yml     | 4 ++--
 src/Bot/Bot.csproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4d8b15..20b1c84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - ops
 
 variables:
-  VERSION: 4.3.0-$CI_COMMIT_SHORT_SHA
+  VERSION: 4.3.0-V$CI_COMMIT_SHORT_SHA
   IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
 
 Build:
@@ -18,7 +18,7 @@ Build:
   script:
     - dotnet restore
     - dotnet test tests
-    - dotnet publish --version-suffix $VERSION -r linux-x64 -c Release -o ./app ./src/Bot/
+    - dotnet publish --version-suffix "$VERSION" -r linux-x64 -c Release -o ./app ./src/Bot/
 
 Package:
   stage: docker
diff --git a/src/Bot/Bot.csproj b/src/Bot/Bot.csproj
index 4cd5b39..ec32e8f 100644
--- a/src/Bot/Bot.csproj
+++ b/src/Bot/Bot.csproj
@@ -7,7 +7,7 @@
         <VersionSuffix>$(VersionSuffix)</VersionSuffix>
         <RootNamespace>Geekbot.Bot</RootNamespace>
         <AssemblyName>Geekbot</AssemblyName>
-            <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
+        <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
         <Version Condition=" '$(VersionSuffix)' == '' ">0.0.0-DEV</Version>
         <Company>Pizza and Coffee Studios</Company>
         <Authors>Pizza and Coffee Studios</Authors>