@@ -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)"
4747Write-Host " Directory: $ ( $pkgProperties.DirectoryPath ) "
4848Write-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}
5556else {
56- $packageSemVer = [AzureEngSemanticVersion ]::new($NewVersionString )
57+ $packageSemVer = [AzureEngSemanticVersion ]::new($pkgProperties.Version )
58+ $packageSemVer.IncrementAndSetToPrerelease ();
5759}
5860
5961if ($packageSemVer.HasValidPrereleaseLabel () -ne $true ) {
@@ -64,7 +66,7 @@ if ($packageSemVer.HasValidPrereleaseLabel() -ne $true) {
6466if ($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+ }
8284else {
8385 Write-Host " $tomlPath already contains version $packageSemVer "
8486}
0 commit comments