From 23b63cb8313637080c124df97fe5d652ab9cabd9 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 1 Feb 2021 18:56:28 -0800 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 1353 (#18348) * Use a helper function to normalize the package name for readme * Get the readme name from artifact-metadata-parsing * Change to the readme * Update eng/common/scripts/artifact-metadata-parsing.ps1 Co-authored-by: Wes Haggard Co-authored-by: Sima Zhu Co-authored-by: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Co-authored-by: Wes Haggard --- eng/common/scripts/artifact-metadata-parsing.ps1 | 6 +++++- eng/common/scripts/update-docs-metadata.ps1 | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/common/scripts/artifact-metadata-parsing.ps1 b/eng/common/scripts/artifact-metadata-parsing.ps1 index 82be9b69ac80..2339155b359d 100644 --- a/eng/common/scripts/artifact-metadata-parsing.ps1 +++ b/eng/common/scripts/artifact-metadata-parsing.ps1 @@ -123,7 +123,10 @@ function VerifyPackages($artifactLocation, $workingDirectory, $apiUrl, $releaseS Write-Host "Maybe a pkg version wasn't updated properly?" exit(1) } - + $docsReadMeName = $parsedPackage.PackageId + if ($parsedPackage.DocsReadMeName) { + $docsReadMeName = $parsedPackage.DocsReadMeName + } $pkgList += New-Object PSObject -Property @{ PackageId = $parsedPackage.PackageId PackageVersion = $parsedPackage.PackageVersion @@ -131,6 +134,7 @@ function VerifyPackages($artifactLocation, $workingDirectory, $apiUrl, $releaseS Tag = $parsedPackage.ReleaseTag ReleaseNotes = $parsedPackage.ReleaseNotes ReadmeContent = $parsedPackage.ReadmeContent + DocsReadMeName = $docsReadMeName IsPrerelease = [AzureEngSemanticVersion]::ParseVersionString($parsedPackage.PackageVersion).IsPrerelease } } diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 0961f5ec6a06..fc16fea9e552 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -103,7 +103,7 @@ foreach ($config in $targets) { Write-Host ($pkgsFiltered | % { $_.PackageId + " " + $_.PackageVersion }) foreach ($packageInfo in $pkgsFiltered) { - $readmeName = "$($packageInfo.PackageId.Replace('azure-','').Replace('Azure.', '').Replace('@azure/', '').ToLower())-readme${suffix}.md" + $readmeName = "$($packageInfo.DocsReadMeName.ToLower())-readme${suffix}.md" $readmeFolder = Join-Path $DocRepoLocation $config.content_folder $readmeLocation = Join-Path $readmeFolder $readmeName