Skip to content

Commit

Permalink
Avoid overwriting package info properties when dev version is added (A…
Browse files Browse the repository at this point in the history
…zure#18083)

Co-authored-by: Praveen Kuttappan <[email protected]>
  • Loading branch information
azure-sdk and praveenkuttappan authored Oct 8, 2021
1 parent b9f21d4 commit 33eccef
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions eng/common/scripts/Save-Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,25 @@ Param (

. (Join-Path $PSScriptRoot common.ps1)

function SetOutput($outputPath, $incomingPackageSpec) {
$outputObject = $incomingPackageSpec
function SetOutput($outputPath, $incomingPackageSpec) {

if ($addDevVersion) {
# If there is an exsiting package info json file read that and set that as output object which gets properties updated here.
if (Test-Path $outputPath)
{
Write-Host "Found existing package info json."
$outputObject = ConvertFrom-Json (Get-Content $outputPath -Raw)
}
else
{
$outputObject = $incomingPackageSpec
}


if ($addDevVersion)
{
# Use the "Version" property which was provided by the incoming package spec
# as the DevVersion. This may be overridden later.
$outputObject.DevVersion = $incomingPackageSpec.Version

# If there is an exsiting package info json file read that and set the
# Version property from that JSON file.
if (Test-Path $outputPath) {
$originalObject = ConvertFrom-Json (Get-Content $outputPath -Raw)
$outputObject.Version = $originalObject.Version
}
}

# Set file paths to relative paths
Expand Down

0 comments on commit 33eccef

Please sign in to comment.