From 9489d00310ccfe855a4270b0767b2f270cf54253 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 24 Jun 2021 12:14:11 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 1729 (#14887) * Check for API review status only if release date is set in changelog * Change property name to ReleaseStatus Co-authored-by: Praveen Kuttappan --- eng/common/scripts/Create-APIReview.ps1 | 4 ++++ eng/common/scripts/Package-Properties.ps1 | 7 +++++++ eng/common/scripts/Save-Package-Properties.ps1 | 1 + 3 files changed, 12 insertions(+) diff --git a/eng/common/scripts/Create-APIReview.ps1 b/eng/common/scripts/Create-APIReview.ps1 index 0ef5e0ba6818..456d249c9c18 100644 --- a/eng/common/scripts/Create-APIReview.ps1 +++ b/eng/common/scripts/Create-APIReview.ps1 @@ -121,6 +121,10 @@ if ($packages) # Ignore API review status for prerelease version Write-Host "Package version is not GA. Ignoring API view approval status" } + elseif (!$pkgInfo.ReleaseStatus -or $pkgInfo.ReleaseStatus -eq "Unreleased") + { + Write-Host "Release date is not set for current version in change log file for package. Ignoring API review approval status since package is not yet ready for release." + } else { # Return error code if status code is 201 for new data plane package diff --git a/eng/common/scripts/Package-Properties.ps1 b/eng/common/scripts/Package-Properties.ps1 index 64698a181b7e..e00ea7bb9eaf 100644 --- a/eng/common/scripts/Package-Properties.ps1 +++ b/eng/common/scripts/Package-Properties.ps1 @@ -13,6 +13,7 @@ class PackageProps [string]$SdkType [boolean]$IsNewSdk [string]$ArtifactName + [string]$ReleaseStatus PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory) { @@ -48,6 +49,12 @@ class PackageProps if (Test-Path (Join-Path $directoryPath "CHANGELOG.md")) { $this.ChangeLogPath = Join-Path $directoryPath "CHANGELOG.md" + # Get release date for current version and set in package property + $changeLogEntry = Get-ChangeLogEntry -ChangeLogLocation $this.ChangeLogPath -VersionString $this.Version + if ($changeLogEntry -and !$changeLogEntry.ReleaseStatus) + { + $this.ReleaseStatus = $changeLogEntry.ReleaseStatus.Trim().Trim("()") + } } else { diff --git a/eng/common/scripts/Save-Package-Properties.ps1 b/eng/common/scripts/Save-Package-Properties.ps1 index 3de89434904a..26f4f17c8807 100644 --- a/eng/common/scripts/Save-Package-Properties.ps1 +++ b/eng/common/scripts/Save-Package-Properties.ps1 @@ -22,6 +22,7 @@ if ($allPackageProperties) Write-Host "Package Version: $($pkg.Version)" Write-Host "Package SDK Type: $($pkg.SdkType)" Write-Host "Artifact Name: $($pkg.ArtifactName)" + Write-Host "Release date: $($pkg.ReleaseStatus)" $configFilePrefix = $pkg.Name if ($pkg.ArtifactName) {