cleanup revision

Author: Bart Koelman

Build.ps1

@@ -65,39 +65,28 @@ function ReportCodeCoverage {
     CheckLastExitCode
 }
 
-# Gets the version suffix from the repo tag
-# example: v1.0.0-preview1-final => preview1-final
-function GetVersionSuffixFromTag {
-    $tag = $env:APPVEYOR_REPO_TAG_NAME
-    $split = $tag -split "-"
-    $suffix = $split[1..2]
-    $final = $suffix -join "-"
-    return $final
-}
-
 function CreateNuGetPackage {
     if ($env:APPVEYOR_REPO_TAG -eq $true) {
-        $revision = GetVersionSuffixFromTag
-        Write-Output "APPVEYOR_REPO_TAG: $env:APPVEYOR_REPO_TAG"
-        Write-Output "VERSION-SUFFIX: $revision"
-
-        if ([string]::IsNullOrWhitespace($revision)) {
-            Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts"
-                                  dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts
-        }
-        else {
-            Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision"
-                                  dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision
-        }
+        # Get the version suffix from the repo tag. Example: v1.0.0-preview1-final => preview1-final
+        $tag = $env:APPVEYOR_REPO_TAG_NAME
+        $segments = $tag -split "-"
+        $suffixSegments = $segments[1..2]
+        $versionSuffix = $suffixSegments -join "-"
     }
     else {
+        # Get the version suffix from the build number, defaulting to 1 for non-cibuilds.
         $revision = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
         $revision = "{0:D4}" -f [convert]::ToInt32($revision, 10)
+        $versionSuffix="pre-$revision"
+    }
 
-        $packageVersionSuffix="pre-$revision"
-        Write-Output "VERSION-SUFFIX: $packageVersionSuffix"
-        Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$packageVersionSuffix"
-                              dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$packageVersionSuffix
+    if ([string]::IsNullOrWhitespace($versionSuffix)) {
+        Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts"
+                              dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts
+    }
+    else {
+        Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$versionSuffix"
+                              dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$versionSuffix
     }
 
     CheckLastExitCode