Update build script with hopes of running consistently on all platforms

Author: nblumhardt

Build.ps1

@@ -2,68 +2,59 @@ echo "build: Build started"
 
 Push-Location $PSScriptRoot
 
-if (Test-Path .\artifacts) {
-    echo "build: Cleaning .\artifacts"
-    Remove-Item .\artifacts -Force -Recurse
+if(Test-Path .\artifacts) {
+	echo "build: Cleaning .\artifacts"
+	Remove-Item .\artifacts -Force -Recurse
 }
 
 & dotnet restore --no-cache
 
 $branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
 $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
 $suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"]
+$commitHash = $(git rev-parse --short HEAD)
+$buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""]
 
-echo "build: Version suffix is $suffix"
+echo "build: Package version suffix is $suffix"
+echo "build: Build version suffix is $buildSuffix"
 
-foreach ($src in dir src/*) {
+foreach ($src in ls src/*) {
     Push-Location $src
 
-    echo "build: Packaging project in $src"
+	echo "build: Packaging project in $src"
 
-    & dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix -p:ContinuousIntegrationBuild=true
-    if ($LASTEXITCODE -ne 0) { exit 1 }
+    & dotnet build -c Release --version-suffix=$buildSuffix
 
-    Pop-Location
-}
-
-foreach ($test in dir test/*.PerformanceTests) {
-    Push-Location $test
-
-    echo "build: Building performance test project in $test"
-
-    & dotnet build -c Release
-    if ($LASTEXITCODE -ne 0) { exit 2 }
+    if($suffix) {
+        & dotnet pack -c Release --include-source --no-build -o ../../artifacts --version-suffix=$suffix  -p:ContinuousIntegrationBuild=true
+    } else {
+        & dotnet pack -c Release --include-source --no-build -o ../../artifacts  -p:ContinuousIntegrationBuild=true
+    }
+    if($LASTEXITCODE -ne 0) { exit 1 }
 
     Pop-Location
 }
 
-foreach ($test in dir test/*.Tests) {
+foreach ($test in ls test/*.Tests) {
     Push-Location $test
 
-    echo "build: Testing project in $test"
+	echo "build: Testing project in $test"
 
-    if ($PSVersionTable.Platform -eq "Unix") {
-        & dotnet test -c Release -f netcoreapp3.1
-        & dotnet test -c Release -f net6.0
-    } else {
-        & dotnet test -c Release
-    }
-
-    if ($LASTEXITCODE -ne 0) { exit 3 }
+    & dotnet test -c Release
+    if($LASTEXITCODE -ne 0) { exit 3 }
 
     Pop-Location
 }
 
-if ($PSVersionTable.Platform -eq "Unix") {
-    Push-Location sample/Sample
+foreach ($test in ls test/*.PerformanceTests) {
+    Push-Location $test
 
-    & dotnet run -f netcoreapp3.1 -c Release --run-once
-    if ($LASTEXITCODE -ne 0) { exit 4 }
+	echo "build: Building performance test project in $test"
 
-    & dotnet run -f net6.0        -c Release --run-once
-    if ($LASTEXITCODE -ne 0) { exit 4 }
+    & dotnet build -c Release
+    if($LASTEXITCODE -ne 0) { exit 2 }
 
     Pop-Location
 }
 
-Pop-Location
+Pop-Location