diff --git a/eng/common/scripts/Create-APIReview.ps1 b/eng/common/scripts/Create-APIReview.ps1 index 0ef5e0ba6818..66f1f3bb4600 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.ReleaseDate -or $pkgInfo.ReleaseDate -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..f0c077c04a8d 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]$ReleaseDate 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 ![System.String]::IsNullOrEmpty($changeLogEntry.ReleaseStatus)) + { + $this.ReleaseDate = $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..e4a1e96f26ec 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.ReleaseDate)" $configFilePrefix = $pkg.Name if ($pkg.ArtifactName) { diff --git a/eng/pipelines/templates/steps/build.yml b/eng/pipelines/templates/steps/build.yml index 2ff746ebc439..c96004c44d6a 100644 --- a/eng/pipelines/templates/steps/build.yml +++ b/eng/pipelines/templates/steps/build.yml @@ -4,12 +4,6 @@ parameters: ServiceDirectory: not-specified steps: - - template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml - parameters: - PackageName: "@azure/template" - ServiceDirectory: "template" - TestPipeline: ${{ parameters.TestPipeline }} - - pwsh: | $folder = "${{parameters.ServiceDirectory}}" if ($folder -eq "*") { $folder = "" } diff --git a/sdk/template/template/CHANGELOG.md b/sdk/template/template/CHANGELOG.md index d8b8443cb988..cb09e962a5cc 100644 --- a/sdk/template/template/CHANGELOG.md +++ b/sdk/template/template/CHANGELOG.md @@ -1,5 +1,9 @@ # Release History +## 1.0.11 (2021-06-23) + +- Test Release Pipeline + ## 1.0.10-beta.1 (2020-11-16) - Test Release Pipeline diff --git a/sdk/template/template/package.json b/sdk/template/template/package.json index 88305b1fb0fd..b5d52907ae8e 100644 --- a/sdk/template/template/package.json +++ b/sdk/template/template/package.json @@ -1,6 +1,6 @@ { "name": "@azure/template", - "version": "1.0.11-beta.1", + "version": "1.0.11", "description": "Example project for learning how to build a client library", "sdk-type": "client", "main": "dist/index.js",