From 2178b94d86fda1927b9696cfc5d080b7acf8c104 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 21 Aug 2025 09:55:49 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 11745 (#6707) * Fix wiql issue in getting release plan work items * Update eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * .NET requires custom source path since source path contains dev tools repo * Remove order by --------- Co-authored-by: Praveen Kuttappan Co-authored-by: Praven Kuttappan <55455725+praveenkuttappan@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../pipelines/templates/steps/mark-release-completion.yml | 3 ++- eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/mark-release-completion.yml b/eng/common/pipelines/templates/steps/mark-release-completion.yml index 3f51a71dd..91a39dc48 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 diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 index 439e58a89..9bf29a72b 100644 --- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 +++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 @@ -1051,7 +1051,7 @@ 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.State] IN ('In Progress')" $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test'" $workItems = Invoke-Query $fields $query return $workItems