From 2d05457cd0fdb0922328b097ed2282bd67f666ba Mon Sep 17 00:00:00 2001
From: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Date: Wed, 20 Aug 2025 17:45:48 -0400
Subject: [PATCH 1/4] Fix wiql issue in getting release plan work items

---
 eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
index 439e58a89ebf..ee879bae77ed 100644
--- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
+++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
@@ -1051,8 +1051,8 @@ function Get-ReleasePlanForPackage($packageName)
     $fieldList = ($fields | ForEach-Object { "[$_]"}) -join ", "
     $query = "SELECT ${fieldList} FROM WorkItems WHERE [Work Item Type] = 'Release Plan' AND [${packageNameFieldName}] = '${packageName}'"
     $query += " AND [${prStatusFieldName}] = 'merged'"
-    $query += " AND [System.State] IN ('In Progress') ORDER BY [System.CreatedDate]"
-    $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test'"
+    $query += " AND [System.State] IN ('In Progress')"
+    $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test' ORDER BY [System.CreatedDate]"
     $workItems = Invoke-Query $fields $query
     return $workItems
 }

From e68313f337d871dbf4f99685eac6208269aa7a86 Mon Sep 17 00:00:00 2001
From: Praven Kuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Date: Wed, 20 Aug 2025 17:56:55 -0400
Subject: [PATCH 2/4] Update
 eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
index ee879bae77ed..c5d153b726dd 100644
--- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
+++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
@@ -1052,7 +1052,8 @@ function Get-ReleasePlanForPackage($packageName)
     $query = "SELECT ${fieldList} FROM WorkItems WHERE [Work Item Type] = 'Release Plan' AND [${packageNameFieldName}] = '${packageName}'"
     $query += " AND [${prStatusFieldName}] = 'merged'"
     $query += " AND [System.State] IN ('In Progress')"
-    $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test' ORDER BY [System.CreatedDate]"
+    $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test'"
+    $query += " ORDER BY [System.CreatedDate]"
     $workItems = Invoke-Query $fields $query
     return $workItems
 }

From bdb224d93d8006f2cc7b96896b0427aeaf5317c7 Mon Sep 17 00:00:00 2001
From: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Date: Wed, 20 Aug 2025 18:03:11 -0400
Subject: [PATCH 3/4] .NET requires custom source path since source path
 contains dev tools repo

---
 .../pipelines/templates/steps/mark-release-completion.yml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/common/pipelines/templates/steps/mark-release-completion.yml b/eng/common/pipelines/templates/steps/mark-release-completion.yml
index 3f51a71ddcc5..91a39dc48c94 100644
--- a/eng/common/pipelines/templates/steps/mark-release-completion.yml
+++ b/eng/common/pipelines/templates/steps/mark-release-completion.yml
@@ -1,6 +1,7 @@
 parameters:
   ConfigFileDir: ''
   PackageArtifactName: ''
+  SourceRootPath: $(Build.SourcesDirectory)
 
 steps:
   - task: AzureCLI@2
@@ -8,7 +9,7 @@ steps:
       azureSubscription: opensource-api-connection
       scriptType: pscore
       scriptLocation: scriptPath
-      scriptPath: $(Build.SourcesDirectory)/eng/common/scripts/Mark-ReleasePlanCompletion.ps1
+      scriptPath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Mark-ReleasePlanCompletion.ps1
       arguments: -PackageInfoFilePath '${{ parameters.ConfigFileDir }}/${{ parameters.PackageArtifactName }}.json'
       workingDirectory: $(Pipeline.Workspace)
     displayName: Mark package as released

From a7a8edd27f17f687ab6dd4c96199b07049ce9116 Mon Sep 17 00:00:00 2001
From: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Date: Thu, 21 Aug 2025 11:20:31 -0400
Subject: [PATCH 4/4] Remove order by

---
 eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
index c5d153b726dd..9bf29a72bde6 100644
--- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
+++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
@@ -1053,7 +1053,6 @@ function Get-ReleasePlanForPackage($packageName)
     $query += " AND [${prStatusFieldName}] = 'merged'"
     $query += " AND [System.State] IN ('In Progress')"
     $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test'"
-    $query += " ORDER BY [System.CreatedDate]"
     $workItems = Invoke-Query $fields $query
     return $workItems
 }