Skip to content

Commit 0c0e674

Browse files
authored
Don't replace existing change log entry (#2221)
1 parent 4780abe commit 0c0e674

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

eng/scripts/Update-PackageVersion.ps1

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Param (
3333
[string] $PackageName,
3434
[string] $NewVersionString,
3535
[string] $ReleaseDate,
36-
[boolean] $ReplaceLatestEntryTitle = $true
36+
[boolean] $ReplaceLatestEntryTitle
3737
)
3838

3939
. (Join-Path $PSScriptRoot '../common/scripts/common.ps1')
@@ -47,13 +47,15 @@ Write-Host " Version: $($pkgProperties.Version)"
4747
Write-Host " Directory: $($pkgProperties.DirectoryPath)"
4848
Write-Host " ChangeLogPath: $($pkgProperties.ChangeLogPath)"
4949

50-
$packageSemVer = [AzureEngSemanticVersion]::new($pkgProperties.Version)
51-
$isUnreleased = !$NewVersionString
52-
if ($isUnreleased) {
53-
$packageSemVer.IncrementAndSetToPrerelease();
50+
#If we're just bumping the version with no release date, we want to set the changelog entry to unreleased
51+
$setChangeLogEntryToUnreleased = !$ReleaseDate -and !$NewVersionString
52+
53+
if ($NewVersionString) {
54+
$packageSemVer = [AzureEngSemanticVersion]::new($NewVersionString)
5455
}
5556
else {
56-
$packageSemVer = [AzureEngSemanticVersion]::new($NewVersionString)
57+
$packageSemVer = [AzureEngSemanticVersion]::new($pkgProperties.Version)
58+
$packageSemVer.IncrementAndSetToPrerelease();
5759
}
5860

5961
if ($packageSemVer.HasValidPrereleaseLabel() -ne $true) {
@@ -64,7 +66,7 @@ if ($packageSemVer.HasValidPrereleaseLabel() -ne $true) {
6466
if ($pkgProperties.ChangeLogPath) {
6567
Write-Host "Updating changelog for $PackageName in $ServiceDirectory."
6668
& "$EngCommonScriptsDir/Update-ChangeLog.ps1" -Version $packageSemVer.ToString() `
67-
-ChangelogPath $pkgProperties.ChangeLogPath -Unreleased $isUnreleased `
69+
-ChangelogPath $pkgProperties.ChangeLogPath -Unreleased $setChangeLogEntryToUnreleased `
6870
-ReplaceLatestEntryTitle $ReplaceLatestEntryTitle -ReleaseDate $ReleaseDate
6971
}
7072

@@ -78,7 +80,7 @@ if ($content -ne $updated) {
7880

7981
cargo metadata --format-version 1 | Out-Null
8082
Write-Host "Updated Cargo.lock using 'cargo metadata'."
81-
}
83+
}
8284
else {
8385
Write-Host "$tomlPath already contains version $packageSemVer"
8486
}

0 commit comments

Comments
 (0)