Skip to content

Commit ac776d1

Browse files
author
Xiting Zhang
committed
Merge remote-tracking branch 'upstream/main'
2 parents b5f06d9 + 2227417 commit ac776d1

File tree

2,200 files changed

+103370
-58928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,200 files changed

+103370
-58928
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108

109109
# ServiceLabel: %Communication - Phone Numbers
110110
# PRLabel: %Communication - Phone Numbers
111-
/sdk/communication/azure-communication-phonenumbers/ @Arazan @whisper6284 @danielortega-msft @sofiar-msft
111+
/sdk/communication/azure-communication-phonenumbers/ @gfeitosa-msft @phermanov-msft @ilyapaliakou-msft @besh2014 @ihuseynov-msft @kirill-linnik
112112

113113
# ServiceLabel: %Communication - Rooms
114114
# PRLabel: %Communication - Rooms

eng/common/instructions/azsdk-tools/create-release-plan.instructions.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ Follow these steps in order to create or manage a release plan for an API specif
2323
Collect the following required information from the user. Do not create a release plan with temporary values. Confirm the values with the user before proceeding to create the release plan.
2424
If any details are missing, prompt the user accordingly:
2525

26-
- **API Lifecycle Stage**: Must be one of:
27-
- Private Preview
28-
- Public Preview
29-
- GA (Generally Available)
3026
- **Service Tree ID**: GUID format identifier for the service in Service Tree. Before creating release plan, always show the value to user and ask them to confirm it's a valid value in service tree.
3127
- **Product Service Tree ID**: GUID format identifier for the product in Service Tree. Before creating release plan, always show the value to user and ask them to confirm it's a valid value in service tree.
3228
- **Expected Release Timeline**: Format must be in "Month YYYY"

eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,29 +94,19 @@ Wait for the user to respond with a confirmation before proceeding to Step 1. Us
9494
**Actions**:
9595
1. Run `azsdk_get_sdk_pull_request_link` to fetch generated SDK PR info.
9696

97-
## Step 9: Validate Label and Codeowners
98-
**Goal**: Validate the label and all codeowners for a service. Create new label and codeowner entry if none exist.
99-
**Actions**:
100-
1. To validate a service label refer to #file:./validate-service-label.instructions.md
101-
2. After service label is validated or created refer to #file:./validate-codeowners.instructions.md
102-
3. Handle post-validation actions based on results:
103-
- **If both label and codeowners were already valid**: Prompt user "Your service label and codeowners are already properly configured. Would you like to modify the existing codeowners entry for your service?"
104-
- **If new label or codeowner entries were created**: Display details of the label and codeowners PR if they were created, then prompt user "The following PRs have been created for your service configuration: [list PRs]. Would you like to make any additional modifications to these entries?"
105-
**Success Criteria**: Service label exists and codeowners are properly configured with at least 2 valid owners. For created entries, showcase all PR's.
106-
107-
## Step 10: Create release plan
97+
## Step 9: Create release plan
10898
**Goal**: Create a release plan for the generated SDKs
10999
**Actions**:
110100
1. Refer to #file:create-release-plan.instructions.md to create a release plan using the spec pull request.
111101
2. If the release plan already exists, display the existing plan details.
112102

113-
## Step 11: Mark Spec PR as Ready for Review
103+
## Step 10: Mark Spec PR as Ready for Review
114104
**Goal**: Update spec PR to ready for review status
115105
**Actions**:
116106
1. Prompt user to change spec PR to ready for review: "Please change the spec pull request to ready for review status"
117107
2. Get approval and merge the spec PR
118108

119-
## Step 12: Release SDK Package
109+
## Step 11: Release SDK Package
120110
**Goal**: Release the SDK package using the release plan
121111
**Actions**:
122112
1. Run `ReleaseSdkPackage` to release the SDK package.

eng/common/scripts/Helpers/CommandInvocation-Helpers.ps1

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
function Invoke-LoggedCommand
1+
. $PSScriptRoot/../logging.ps1
2+
3+
function Invoke-LoggedMsbuildCommand
24
{
35
[CmdletBinding()]
46
param
@@ -8,12 +10,26 @@ function Invoke-LoggedCommand
810
[switch] $GroupOutput,
911
[int[]] $AllowedExitCodes = @(0)
1012
)
13+
return Invoke-LoggedCommand $Command -ExecutePath $ExecutePath -GroupOutput:$GroupOutput -AllowedExitCodes $AllowedExitCodes -OutputProcessor { param($line) ProcessMsBuildLogLine $line }
14+
15+
}
16+
17+
function Invoke-LoggedCommand
18+
{
19+
[CmdletBinding()]
20+
param
21+
(
22+
[string] $Command,
23+
[string] $ExecutePath,
24+
[switch] $GroupOutput,
25+
[int[]] $AllowedExitCodes = @(0),
26+
[scriptblock] $OutputProcessor
27+
)
1128

12-
$pipelineBuild = !!$env:TF_BUILD
1329
$startTime = Get-Date
1430

15-
if($pipelineBuild -and $GroupOutput) {
16-
Write-Host "##[group]$Command"
31+
if($GroupOutput) {
32+
LogGroupStart $Command
1733
} else {
1834
Write-Host "> $Command"
1935
}
@@ -22,22 +38,22 @@ function Invoke-LoggedCommand
2238
Push-Location $ExecutePath
2339
}
2440

41+
if (!$OutputProcessor) {
42+
$OutputProcessor = { param($line) $line }
43+
}
44+
2545
try {
26-
Invoke-Expression $Command
46+
Invoke-Expression $Command | Foreach-Object { & $OutputProcessor $_ }
2747

2848
$duration = (Get-Date) - $startTime
2949

30-
if($pipelineBuild -and $GroupOutput) {
31-
Write-Host "##[endgroup]"
50+
if($GroupOutput) {
51+
LogGroupEnd
3252
}
3353

3454
if($LastExitCode -notin $AllowedExitCodes)
3555
{
36-
if($pipelineBuild) {
37-
Write-Error "##[error]Command failed to execute ($duration): $Command`n"
38-
} else {
39-
Write-Error "Command failed to execute ($duration): $Command`n"
40-
}
56+
LogError "Command failed to execute ($duration): $Command`n"
4157
}
4258
else {
4359
Write-Host "Command succeeded ($duration)`n"

eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,12 +1085,15 @@ function Update-PullRequestInReleasePlan($releasePlanWorkItemId, $pullRequestUrl
10851085
}
10861086

10871087
$fields = @()
1088-
$fields += "`"SDKPullRequestFor$($devopsFieldLanguage)=$pullRequestUrl`""
1088+
if ($pullRequestUrl)
1089+
{
1090+
$fields += "`"SDKPullRequestFor$($devopsFieldLanguage)=$pullRequestUrl`""
1091+
}
10891092
$fields += "`"SDKPullRequestStatusFor$($devopsFieldLanguage)=$status`""
10901093

1091-
Write-Host "Updating Release Plan [$releasePlanWorkItemId] with Pull Request URL for language [$languageName]."
1094+
Write-Host "Updating release plan [$releasePlanWorkItemId] with pull request details for language [$languageName]."
10921095
$workItem = UpdateWorkItem -id $releasePlanWorkItemId -fields $fields
1093-
Write-Host "Updated Pull Request URL [$pullRequestUrl] for [$languageName] in Release Plan [$releasePlanWorkItemId]"
1096+
Write-Host "Updated pull request details for [$languageName] in release plan [$releasePlanWorkItemId]"
10941097
}
10951098

10961099
function Get-ReleasePlan-Link($releasePlanWorkItemId)

eng/common/scripts/Submit-PullRequest.ps1

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ else {
130130

131131
# ensure that the user that was used to create the PR is not attempted to add as a reviewer
132132
# we cast to an array to ensure that length-1 arrays actually stay as array values
133-
$cleanedUsers = @(SplitParameterArray -members $UserReviewers) | ? { $_ -ne $prOwnerUser -and $null -ne $_ }
133+
# we also filter out dependabot user who doesn't have write permission to avoid errors
134+
$cleanedUsers = @(SplitParameterArray -members $UserReviewers) | ? { $_ -ne $prOwnerUser -and $null -ne $_ -and $_ -inotlike "dependabot*" }
134135
$cleanedTeamReviewers = @(SplitParameterArray -members $TeamReviewers) | ? { $_ -ne $prOwnerUser -and $null -ne $_ }
135136

136137
if ($cleanedUsers -or $cleanedTeamReviewers) {
@@ -146,8 +147,13 @@ else {
146147
$prState = "open"
147148
}
148149

150+
# Clean assignees - remove null entries and bot accounts
151+
$cleanedAssignees = @(SplitParameterArray -members $Assignees) | ? {
152+
$null -ne $_ -and $_ -inotlike "dependabot*" -and $_ -inotlike "copilot*"
153+
}
154+
149155
Update-GitHubIssue -RepoOwner $RepoOwner -RepoName $RepoName -IssueNumber $prNumber `
150-
-State $prState -Labels $PRLabels -Assignees $Assignees -AuthToken $AuthToken
156+
-State $prState -Labels $PRLabels -Assignees $cleanedAssignees -AuthToken $AuthToken
151157

152158
if ($AddBuildSummary) {
153159
$summaryPath = New-TemporaryFile

eng/common/scripts/logging.ps1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,15 @@ function LogJobFailure() {
111111
}
112112
# No equivalent for GitHub Actions. Failure is only determined by nonzero exit code.
113113
}
114+
115+
function ProcessMsBuildLogLine($line) {
116+
if (Test-SupportsDevOpsLogging) {
117+
if ($line -like "*: warning*") {
118+
return ("##vso[task.LogIssue type=warning;]$line" -replace "`n", "%0D%0A")
119+
}
120+
elseif ($line -like "*: error*") {
121+
return ("##vso[task.LogIssue type=error;]$line" -replace "`n", "%0D%0A")
122+
}
123+
}
124+
return $line
125+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0-dev.20250805.1
1+
1.0.0-dev.20250922.2

eng/common/tsp-client/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/tsp-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": {
3-
"@azure-tools/typespec-client-generator-cli": "0.28.1"
3+
"@azure-tools/typespec-client-generator-cli": "0.28.3"
44
}
55
}

0 commit comments

Comments
 (0)