Fix/hotfix version calculation (#94)

genexuslabs · Oct 17, 2023 · 7c5d22b · 7c5d22b
1 parent d43e141
commit 7c5d22b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/.github/generatePackageVersion.ps1 b/.github/generatePackageVersion.ps1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,8 +35,6 @@ jobs:
 
       - name: Calculate environment variables
         id: buildVariables
-        env:
-          PackageVersionString: ./.github/generatePackageVersion.ps1
         run: |
           $IsMaster = $false
           switch -regex ($Env:GIT_REF) {
@@ -62,15 +60,17 @@ jobs:
           $COMMIT_MESSAGE = $(git log -1 --pretty=%B)
           $LAST_COMMITTER = $(git log -1 --pretty=format:%an)
 
-          $NUGET_PACKAGE_VERSION = & "$Env:PackageVersionString"        
+          $GetFileVersionOutput = dotnet msbuild ./Directory.Build.props /t:GetFileVersionForPackage /p:COMMIT_NUMBER=$COMMIT_NUMBER /p:VersionSuffix="" /p:UseDefaultSuffix=false
+          "$GetFileVersionOutput" -match "(?<=FileVersion:)(.*)" > $null
+          $NUGET_PACKAGE_VERSION = $Matches[0]
                   
           if ($IsPrerelease -eq $true) {
             $VersionTag =  @("trunk", "stable")[$IsMaster]
             $Timestamp = (Get-Date -AsUTC).ToString("yyyyMMddHHmmss")
             $NUGET_PACKAGE_VERSION = $NUGET_PACKAGE_VERSION + "-" + $VersionTag + "." + $Timestamp
           }
 
-          Write-Output "Packge version to be used: $NUGET_PACKAGE_VERSION"
+          Write-Output "Package version to be used: $NUGET_PACKAGE_VERSION"
           echo "NUGET_PACKAGE_VERSION=$NUGET_PACKAGE_VERSION" >> $env:GITHUB_ENV
           echo "IsPrerelease=$IsPrerelease" >> $env:GITHUB_ENV
           echo "NUGET_PACKAGE_VERSION=$NUGET_PACKAGE_VERSION" >> $env:GITHUB_OUTPUT