Skip to content

Sync eng/common directory with azure-sdk-tools for PR 1479 #17244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azure-sdk merged 1 commit into from
Mar 10, 2021
Merged

Sync eng/common directory with azure-sdk-tools for PR 1479 #17244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions eng/common/scripts/ChangeLog-Operations.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,14 @@ function Set-ChangeLogContent {

try
{
$VersionsSorted = [AzureEngSemanticVersion]::SortVersionStrings($ChangeLogEntries.Keys)
$ChangeLogEntries = $ChangeLogEntries.Values | Sort-Object -Descending -Property ReleaseStatus, ReleaseVersion
}
catch {
LogError "Problem sorting version in ChangeLogEntries"
return
}

foreach ($version in $VersionsSorted) {
$changeLogEntry = $ChangeLogEntries[$version]
foreach ($changeLogEntry in $ChangeLogEntries) {
$changeLogContent += $changeLogEntry.ReleaseTitle
if ($changeLogEntry.ReleaseContent.Count -eq 0) {
$changeLogContent += @("","")
Expand Down
32 changes: 27 additions & 5 deletions eng/common/scripts/SemVer.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Components: Major.Minor.Patch-PrereleaseLabel.PrereleaseNumber.BuildNumber
Note: A builtin Powershell version of SemVer exists in 'System.Management.Automation'. At this time, it does not parsing of PrereleaseNumber. It's name is also type accelerated to 'SemVer'.
#>

class AzureEngSemanticVersion {
class AzureEngSemanticVersion : IComparable {
[int] $Major
[int] $Minor
[int] $Patch
Expand Down Expand Up @@ -178,6 +178,31 @@ class AzureEngSemanticVersion {
$this.DefaultAlphaReleaseLabel = "alpha"
}

[int] CompareTo($other)
{
if ($other -isnot [AzureEngSemanticVersion]) {
throw "Cannot compare $other with $this"
}

$ret = $this.Major.CompareTo($other.Major)
if ($ret) { return $ret }

$ret = $this.Minor.CompareTo($other.Minor)
if ($ret) { return $ret }

$ret = $this.Patch.CompareTo($other.Patch)
if ($ret) { return $ret }

# Mimic PowerShell that uses case-insensitive comparisons by default.
$ret = [string]::Compare($this.PrereleaseLabel, $other.PrereleaseLabel, $true)
if ($ret) { return $ret }

$ret = $this.PrereleaseNumber.CompareTo($other.PrereleaseNumber)
if ($ret) { return $ret }

return ([int] $this.BuildNumber).CompareTo([int] $other.BuildNumber)
}

static [string[]] SortVersionStrings([string[]] $versionStrings)
{
$versions = $versionStrings | ForEach-Object { [AzureEngSemanticVersion]::ParseVersionString($_) }
Expand All @@ -187,10 +212,7 @@ class AzureEngSemanticVersion {

static [AzureEngSemanticVersion[]] SortVersions([AzureEngSemanticVersion[]] $versions)
{
return ($versions | `
Sort-Object -Descending -Property `
Major, Minor, Patch, PrereleaseLabel, PrereleaseNumber, `
@{ Expression = { [int]$_.BuildNumber }; Descending = $true })
return $versions | Sort-Object -Descending
}

static [void] QuickTests()
Expand Down