From 947aa79e5d4c756f86a8e23a89fe9c3aff7b0eba Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Tue, 14 Dec 2021 15:57:31 +0300 Subject: [PATCH] Update 1-fetch-and-build.ps1 --- deploy/1-fetch-and-build.ps1 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/deploy/1-fetch-and-build.ps1 b/deploy/1-fetch-and-build.ps1 index 7574068d6c..56944caf09 100644 --- a/deploy/1-fetch-and-build.ps1 +++ b/deploy/1-fetch-and-build.ps1 @@ -3,12 +3,14 @@ param( [string]$newVersion ) +. ..\nupkg\common.ps1 + if (!$branch) { $branch = Read-Host "Enter the branch name" } -# Read the current version from common.props +#----------- Read the current version from common.props ----------- $commonPropsFilePath = resolve-path "../common.props" $commonPropsXmlCurrent = [xml](Get-Content $commonPropsFilePath ) $currentVersion = $commonPropsXmlCurrent.Project.PropertyGroup.Version.Trim() @@ -33,13 +35,16 @@ if ($newVersion -ne $currentVersion){ } -echo "`n-----=====[ PULLING ABP REPO - BRANCH: $branch ]=====-----`n" +################################################################ +Write-Info "Pulling ABP $branch branch from GitHub" cd .. git switch $branch git pull origin -echo "`n-----=====[ BUILDING ALL PROJECTS ]=====-----`n" +################################################################ +Write-Info "Building ABP repository" cd build .\build-all-release.ps1 -echo "`n-----=====[ BUILDING ALL PROJECTS COMPLETED]=====-----`n" \ No newline at end of file +Write-Info "Building ABP repository completed" +cd ..\deploy #always return to the deploy directory \ No newline at end of file