From e7ca8e77959cb549515c165ce86e904e63158024 Mon Sep 17 00:00:00 2001
From: Maxwell Weru <mburumaxwell@gmail.com>
Date: Sat, 17 Feb 2024 10:12:03 +0300
Subject: [PATCH] Fix versioning in workflows (#211)

---
 .github/workflows/build.yml | 17 +++++++++--------
 src/Directory.Build.props   |  4 ----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd2a50de..13ed38ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,6 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     env:
-      buildConfiguration: 'Release'
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 
     steps:
@@ -40,12 +39,13 @@ jobs:
         fetch-depth: 0 # Required for GitVersion
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v0.10
+      uses: gittools/actions/gitversion/setup@v0
       with:
         versionSpec: '5.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v0.10
+      uses: gittools/actions/gitversion/execute@v0
+      id: gitversion
       with:
         useConfigFile: true
 
@@ -57,16 +57,17 @@ jobs:
     - name: Build & Test
       run: >
         dotnet test
-        --configuration $buildConfiguration
+        --configuration Release
         --collect "Code coverage"
 
     - name: Pack
       run: >
         dotnet pack
-        --configuration $buildConfiguration
+        --configuration Release
         --no-build
-        --output $GITHUB_WORKSPACE/drop
-        -p:PackageVersion=$GITVERSION_NUGETVERSION
+        --output ${{ github.workspace }}/drop
+        -p:PackageVersion=${{ steps.gitversion.outputs.nuGetVersion }}
+        -p:VersionPrefix=${{ steps.gitversion.outputs.nuGetVersion }}
 
     - name: Publish Artifact
       uses: actions/upload-artifact@v4
@@ -96,6 +97,6 @@ jobs:
 
     - name: Publish to NuGet.org
       run: >
-        dotnet nuget push "$GITHUB_WORKSPACE/drop/*"
+        dotnet nuget push "${{ github.workspace }}/drop/*"
         -k ${{ secrets.NUGET_API_KEY }}
         --skip-duplicate
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4b67aef6..810246f7 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -23,10 +23,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <VersionPrefix Condition="'$(GITVERSION_NUGETVERSION)' != ''">$(GITVERSION_NUGETVERSION)</VersionPrefix>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />