From cb9e8a993517bbc7c9f8ff0d456ef88026a15aa6 Mon Sep 17 00:00:00 2001
From: Justin Chung <124807742+jshigetomi@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:17:24 -0600
Subject: [PATCH] Fix Changelog content grab during GitHub Release (#24788)

Co-authored-by: Justin Chung <chungjustin@microsoft.com>
---
 .pipelines/templates/release-githubtasks.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.pipelines/templates/release-githubtasks.yml b/.pipelines/templates/release-githubtasks.yml
index f448b73683..acdb45e18f 100644
--- a/.pipelines/templates/release-githubtasks.yml
+++ b/.pipelines/templates/release-githubtasks.yml
@@ -75,14 +75,12 @@ jobs:
   
         $changelog = Get-Content -Path $filePath
   
-        $startPattern = "^## \[" + ([regex]::Escape($releaseVersion)) + "\]"
-        $endPattern = "^## \[{0}\.{1}\.{2}*" -f $semanticVersion.Major, $semanticVersion.Minor, $semanticVersion.Patch
+        $headingPattern = "^## \[\d+\.\d+\.\d+"
+        $headingStartLines = $changelog | Select-String -Pattern $headingPattern | Select-Object -ExpandProperty LineNumber
+        $startLine = $headingStartLines[0]
+        $endLine = $headingStartLines[1] - 1
   
-        $clContent = $changelog | ForEach-Object {
-            if ($_ -match $startPattern) { $outputLine = $true }
-            elseif ($_ -match $endPattern) { $outputLine = $false }
-            if ($outputLine) { $_}
-          } | Out-String
+        $clContent = $changelog | Select-Object -Skip ($startLine-1) -First ($endLine - $startLine) | Out-String
   
         Write-Verbose -Verbose "Selected content: `n$clContent"