From bc76ea2bd9a7a8a39997821dc9f56f98371c7d1f Mon Sep 17 00:00:00 2001 From: Neil Campbell Date: Sun, 7 Dec 2014 22:24:30 +1100 Subject: [PATCH] Removing build script tests and fixing the build issue caused by an AppVeyor breaking change --- Build/Setup-Build-Environment.ps1 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Build/Setup-Build-Environment.ps1 b/Build/Setup-Build-Environment.ps1 index f8818bd5..d4e5cc8b 100644 --- a/Build/Setup-Build-Environment.ps1 +++ b/Build/Setup-Build-Environment.ps1 @@ -2,7 +2,6 @@ param ( ) $BuildNumber = $env:APPVEYOR_BUILD_NUMBER -$Branch = $env:APPVEYOR_REPO_BRANCH $IsTagBuild = $env:APPVEYOR_REPO_TAG $PactNetVersion @@ -10,8 +9,9 @@ $PactNetAssemblyVersion if($IsTagBuild -eq 'True') { - $PactNetVersion = "$Branch" - $PactNetAssemblyVersion = ($Branch -replace "[^0-9,.]", '') + ".$BuildNumber" + $TagName = $env:APPVEYOR_REPO_TAG_NAME #was APPVEYOR_REPO_BRANCH + $PactNetVersion = "$TagName" + $PactNetAssemblyVersion = ($TagName -replace "[^0-9,.]", '') + ".$BuildNumber" } else { @@ -22,8 +22,5 @@ else $env:PACTNET_VERSION = $PactNetVersion $env:PACTNET_ASSEMBLY_VERSION = $PactNetAssemblyVersion -Write-Host "env:PACTNET_VERSION = $PactNetVersion" -Write-Host "env:PACTNET_ASSEMBLY_VERSION = $PactNetAssemblyVersion" - -Write-Host "### Printing local environment variables ###" -Write-Host (Get-ChildItem Env: | Format-List | Out-String) \ No newline at end of file +Write-Host "Set env:PACTNET_VERSION = $PactNetVersion" +Write-Host "Set env:PACTNET_ASSEMBLY_VERSION = $PactNetAssemblyVersion" \ No newline at end of file