diff --git a/distribution/windows/build.ps1 b/distribution/windows/build.ps1 index 2836e38771..21d0d383e5 100644 --- a/distribution/windows/build.ps1 +++ b/distribution/windows/build.ps1 @@ -1,3 +1,9 @@ +param ( + [Parameter(Position = 1)] + [string]$BuildNumber = "", + [string]$GitBranch = "" +) + $path = Split-Path $Script:MyInvocation.MyCommand.Path Write-Host "Building Windows Installer (NSIS script)"; -makensis /DVERSION_INCLUDE=$path\win32.txt $path\install.nsi > $path\win32.log; +makensis /DAPPV_BUILD=$BuildNumber /DAPPV_EXTRA=-$GitBranch-b$BuildNumber /DVERSION_INCLUDE=$path\win32.txt $path\install.nsi > $path\win32.log; diff --git a/scripts/ps/publish.ps1 b/scripts/ps/publish.ps1 index b626cbac14..e96dc733f9 100644 --- a/scripts/ps/publish.ps1 +++ b/scripts/ps/publish.ps1 @@ -120,7 +120,7 @@ function Do-Installer() New-Item -Force -ItemType Directory $artifactsDir > $null # Create installer - & "$installerDir\build.ps1" + & "$installerDir\build.ps1" -BuildNumber $BuildNumber -GitBranch $GitBranch if ($LASTEXITCODE -ne 0) { Write-Host "Failed to create installer." -ForegroundColor Red @@ -138,7 +138,7 @@ function Do-Installer() return 1 } - Copy-Item $binaries[0].FullName $artifactsDir + Move-Item $binaries[0].FullName $artifactsDir return 0 }