From 7c48bfc9d1cefba42390d3f1efba4812155425f2 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 15 Sep 2020 10:42:43 -0700 Subject: [PATCH 1/8] Fixed the bug of missing title --- eng/common/scripts/update-docs-metadata.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 34aa42801ec..3b7c0e945a2 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -70,12 +70,15 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ } $fileContent = $pkgInfo.ReadmeContent - $foundTitle = "" # only replace the version if the formatted header can be found $titleRegex = "(\# Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C))" - $fileContent = $pkgInfo.ReadmeContent -replace $titleRegex, "`${1} - Version $($pkgInfo.PackageVersion) `n" - + $titleRegex = "(\# Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C))" + $fileTitle = "" + if ($pkgInfo.ReadmeContent -match $titleRegex) { + $fileContent = $pkgInfo.ReadmeContent -replace $titleRegex, "`${1} - Version $($pkgInfo.PackageVersion) `n" + $fileTitle = $Matches[0].Substring(2) + } # Replace github master link with release tag. $ReplacementPattern = "`${1}$($pkgInfo.Tag)" $fileContent = $fileContent -replace $releaseReplaceRegex, $ReplacementPattern From 054490d23006f3b95c274f33cc5f22e766c4640b Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 15 Sep 2020 11:09:42 -0700 Subject: [PATCH 2/8] Added comments to make the call clear. --- eng/common/scripts/update-docs-metadata.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 3b7c0e945a2..580d2fc031e 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -77,6 +77,7 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ $fileTitle = "" if ($pkgInfo.ReadmeContent -match $titleRegex) { $fileContent = $pkgInfo.ReadmeContent -replace $titleRegex, "`${1} - Version $($pkgInfo.PackageVersion) `n" + # The if block gurantee there is at least one match which starts with the format of "# Azure..." $fileTitle = $Matches[0].Substring(2) } # Replace github master link with release tag. From 353b9431c5b3ae839fdddb3464bff318428962a5 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 15 Sep 2020 11:12:04 -0700 Subject: [PATCH 3/8] Remove extra title regex --- eng/common/scripts/update-docs-metadata.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 580d2fc031e..59b3f6b04ec 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -73,7 +73,6 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ # only replace the version if the formatted header can be found $titleRegex = "(\# Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C))" - $titleRegex = "(\# Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C))" $fileTitle = "" if ($pkgInfo.ReadmeContent -match $titleRegex) { $fileContent = $pkgInfo.ReadmeContent -replace $titleRegex, "`${1} - Version $($pkgInfo.PackageVersion) `n" From 81f28dcf6f9d5ee5e4d9e08874869e4b0037f226 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 15 Sep 2020 11:23:32 -0700 Subject: [PATCH 4/8] Fixed the regex for both purpose --- eng/common/scripts/update-docs-metadata.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 59b3f6b04ec..991d66c3932 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -72,12 +72,12 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ $fileContent = $pkgInfo.ReadmeContent # only replace the version if the formatted header can be found - $titleRegex = "(\# Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C))" + $titleRegex = "(\#.*(?Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C)))" $fileTitle = "" if ($pkgInfo.ReadmeContent -match $titleRegex) { - $fileContent = $pkgInfo.ReadmeContent -replace $titleRegex, "`${1} - Version $($pkgInfo.PackageVersion) `n" + $fileContent = $fileContent -replace $titleRegex, "`${0} - Version $($pkgInfo.PackageVersion) `n" # The if block gurantee there is at least one match which starts with the format of "# Azure..." - $fileTitle = $Matches[0].Substring(2) + $fileTitle = $matches["filetitle"] } # Replace github master link with release tag. $ReplacementPattern = "`${1}$($pkgInfo.Tag)" From ee14881cc8d3f7c3eb4aa3efa85b7fc5e14b0fd3 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Tue, 15 Sep 2020 11:28:53 -0700 Subject: [PATCH 5/8] Update eng/common/scripts/update-docs-metadata.ps1 Co-authored-by: Wes Haggard --- eng/common/scripts/update-docs-metadata.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 991d66c3932..1a1c4ba2b15 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -72,7 +72,7 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ $fileContent = $pkgInfo.ReadmeContent # only replace the version if the formatted header can be found - $titleRegex = "(\#.*(?Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C)))" + $titleRegex = "(\#\s+(?Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C)))" $fileTitle = "" if ($pkgInfo.ReadmeContent -match $titleRegex) { $fileContent = $fileContent -replace $titleRegex, "`${0} - Version $($pkgInfo.PackageVersion) `n" From daf84edd56f380f8908cdd4fcf2fe4593f265102 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 15 Sep 2020 11:49:12 -0700 Subject: [PATCH 6/8] remove commnets --- eng/common/scripts/update-docs-metadata.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 991d66c3932..13d5d5a3208 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -76,7 +76,6 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ $fileTitle = "" if ($pkgInfo.ReadmeContent -match $titleRegex) { $fileContent = $fileContent -replace $titleRegex, "`${0} - Version $($pkgInfo.PackageVersion) `n" - # The if block gurantee there is at least one match which starts with the format of "# Azure..." $fileTitle = $matches["filetitle"] } # Replace github master link with release tag. From 7bd7a3b3ebed9dbdd8fb2702af9f1ec06c962c6a Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 15 Sep 2020 12:28:09 -0700 Subject: [PATCH 7/8] Fixed wrong var name --- eng/common/scripts/update-docs-metadata.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 121d0a56372..62986a1c8c8 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -73,10 +73,10 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ # only replace the version if the formatted header can be found $titleRegex = "(\#\s+(?Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C)))" - $fileTitle = "" + $foundTitle = "" if ($pkgInfo.ReadmeContent -match $titleRegex) { $fileContent = $fileContent -replace $titleRegex, "`${0} - Version $($pkgInfo.PackageVersion) `n" - $fileTitle = $matches["filetitle"] + $foundTitle = $matches["filetitle"] } # Replace github master link with release tag. $ReplacementPattern = "`${1}$($pkgInfo.Tag)" From 874c59b413324f236c9a71d242985926021325e0 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Tue, 15 Sep 2020 14:39:43 -0700 Subject: [PATCH 8/8] Update eng/common/scripts/update-docs-metadata.ps1 Co-authored-by: Wes Haggard --- eng/common/scripts/update-docs-metadata.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1 index 62986a1c8c8..2f7f3343de4 100644 --- a/eng/common/scripts/update-docs-metadata.ps1 +++ b/eng/common/scripts/update-docs-metadata.ps1 @@ -74,7 +74,7 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){ # only replace the version if the formatted header can be found $titleRegex = "(\#\s+(?Azure .+? (?:client|plugin|shared) library for (?:JavaScript|Java|Python|\.NET|C)))" $foundTitle = "" - if ($pkgInfo.ReadmeContent -match $titleRegex) { + if ($fileContent -match $titleRegex) { $fileContent = $fileContent -replace $titleRegex, "`${0} - Version $($pkgInfo.PackageVersion) `n" $foundTitle = $matches["filetitle"] }