From 572a7803d95ef859a91aea13f4dd5b8dd1f35b68 Mon Sep 17 00:00:00 2001 From: sima-zhu Date: Fri, 11 Mar 2022 10:00:14 -0800 Subject: [PATCH 1/4] Read the ms.service value from csv metadata --- eng/common/scripts/Update-DocsMsMetadata.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1 index ed9dfe55c9f9..0d6660e8dd95 100644 --- a/eng/common/scripts/Update-DocsMsMetadata.ps1 +++ b/eng/common/scripts/Update-DocsMsMetadata.ps1 @@ -80,14 +80,14 @@ $TITLE_REGEX = "(\#\s+(?Azure .+? (?:client|plugin|shared) library fo function GetAdjustedReadmeContent($ReadmeContent, $PackageInfo, $PackageMetadata) { # The $PackageMetadata could be $null if there is no associated metadata entry # based on how the metadata CSV is filtered - $service = $PackageInfo.ServiceDirectory.ToLower() - if ($PackageMetadata -and $PackageMetadata.ServiceName) { - # Normalize service name "Key Vault" -> "keyvault" + $service = $PackageInfo.ServiceDirectory.ToLower() + if ($PackageMetadata -and $PackageMetadata.MSDocService) { + # Use MSDocService in csv metadata to override the service directory # TODO: Use taxonomy for service name -- https://github.com/Azure/azure-sdk-tools/issues/1442 - # probably from metadata - $service = $PackageMetadata.ServiceName.ToLower().Replace(" ", "") + $service = $PackageMetadata.MSDocService } + # Generate the release tag for use in link substitution $tag = "$($PackageInfo.Name)_$($PackageInfo.Version)" Write-Host "The tag of package: $tag" From 52319668a962b8a8becc0633bb7d0c91b8872130 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:45:20 -0700 Subject: [PATCH 2/4] Update eng/common/scripts/Update-DocsMsMetadata.ps1 Co-authored-by: Wes Haggard --- eng/common/scripts/Update-DocsMsMetadata.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1 index 0d6660e8dd95..31835dabf4b2 100644 --- a/eng/common/scripts/Update-DocsMsMetadata.ps1 +++ b/eng/common/scripts/Update-DocsMsMetadata.ps1 @@ -80,7 +80,7 @@ $TITLE_REGEX = "(\#\s+(?Azure .+? (?:client|plugin|shared) library fo function GetAdjustedReadmeContent($ReadmeContent, $PackageInfo, $PackageMetadata) { # The $PackageMetadata could be $null if there is no associated metadata entry # based on how the metadata CSV is filtered - $service = $PackageInfo.ServiceDirectory.ToLower() + $service = $PackageInfo.ServiceDirectory.ToLower() if ($PackageMetadata -and $PackageMetadata.MSDocService) { # Use MSDocService in csv metadata to override the service directory # TODO: Use taxonomy for service name -- https://github.com/Azure/azure-sdk-tools/issues/1442 From 82b5124107945ef62f301dfb8cb549587dff8c4c Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:45:26 -0700 Subject: [PATCH 3/4] Update eng/common/scripts/Update-DocsMsMetadata.ps1 Co-authored-by: Wes Haggard --- eng/common/scripts/Update-DocsMsMetadata.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1 index 31835dabf4b2..91cbaaedda93 100644 --- a/eng/common/scripts/Update-DocsMsMetadata.ps1 +++ b/eng/common/scripts/Update-DocsMsMetadata.ps1 @@ -87,7 +87,6 @@ function GetAdjustedReadmeContent($ReadmeContent, $PackageInfo, $PackageMetadata $service = $PackageMetadata.MSDocService } - # Generate the release tag for use in link substitution $tag = "$($PackageInfo.Name)_$($PackageInfo.Version)" Write-Host "The tag of package: $tag" From a6ad6b5fe918fbbf6182b261913bbee8062a8665 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Mon, 14 Mar 2022 13:09:55 -0700 Subject: [PATCH 4/4] Update Update-DocsMsMetadata.ps1 --- eng/common/scripts/Update-DocsMsMetadata.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1 index 91cbaaedda93..93893098c5f8 100644 --- a/eng/common/scripts/Update-DocsMsMetadata.ps1 +++ b/eng/common/scripts/Update-DocsMsMetadata.ps1 @@ -86,7 +86,7 @@ function GetAdjustedReadmeContent($ReadmeContent, $PackageInfo, $PackageMetadata # TODO: Use taxonomy for service name -- https://github.com/Azure/azure-sdk-tools/issues/1442 $service = $PackageMetadata.MSDocService } - + Write-Host "The service of package: $service" # Generate the release tag for use in link substitution $tag = "$($PackageInfo.Name)_$($PackageInfo.Version)" Write-Host "The tag of package: $tag"