Skip to content

Commit de62db6

Browse files
Merge branch 'azure-sdk:main' into main
2 parents 859c8b4 + 1fc1051 commit de62db6

File tree

159 files changed

+10844
-6041
lines changed

Some content is hidden

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

159 files changed

+10844
-6041
lines changed

eng/.docsettings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ known_content_issues:
127127
- ['sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/README.md','azure-sdk-tools/issues/404']
128128
- ['sdk/extensions/Microsoft.Azure.WebJobs.Extensions.Clients/README.md','azure-sdk-tools/issues/404']
129129
- ['sdk/extensions/Microsoft.Extensions.Azure/README.md','azure-sdk-tools/issues/404']
130+
- ['sdk/identity/Azure.Identity.Broker/README.md','azure-sdk-tools/issues/404']
130131
- ['sdk/storage/Azure.Storage.Common/README.md','azure-sdk-tools/issues/404']
131132
- ['sdk/textanalytics/Azure.AI.TextAnalytics.Legacy.Shared/README.md','https://github.com/Azure/azure-sdk-tools/issues/404']
132133
- ['sdk/webpubsub/Azure.Messaging.WebPubSub/README.md', 'azure-sdk-tools/issues/404 - requires different name for auth section']

eng/Packages.Data.props

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

458458
<PropertyGroup>
459459
<TestProxyVersion>1.0.0-dev.20250805.1</TestProxyVersion>
460-
<UnbrandedGeneratorVersion>1.0.0-alpha.20250828.2</UnbrandedGeneratorVersion>
460+
<UnbrandedGeneratorVersion>1.0.0-alpha.20250902.2</UnbrandedGeneratorVersion>
461461
<AzureGeneratorVersion>1.0.0-alpha.20250826.3</AzureGeneratorVersion>
462462
</PropertyGroup>
463463
</Project>

eng/azure-typespec-http-client-csharp-emitter-package-lock.json

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

eng/azure-typespec-http-client-csharp-emitter-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"main": "dist/src/index.js",
33
"dependencies": {
4-
"@azure-typespec/http-client-csharp": "1.0.0-alpha.20250828.2"
4+
"@azure-typespec/http-client-csharp": "1.0.0-alpha.20250902.2"
55
},
66
"devDependencies": {
77
"@azure-tools/typespec-azure-core": "0.59.0",

eng/azure-typespec-http-client-csharp-mgmt-emitter-package-lock.json

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

eng/azure-typespec-http-client-csharp-mgmt-emitter-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"main": "dist/src/index.js",
33
"dependencies": {
4-
"@azure-typespec/http-client-csharp-mgmt": "1.0.0-alpha.20250827.1"
4+
"@azure-typespec/http-client-csharp-mgmt": "1.0.0-alpha.20250902.1"
55
},
66
"devDependencies": {
77
"@azure-tools/typespec-azure-core": "0.59.0",

eng/common/TestResources/New-TestResources.ps1

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,15 @@ try {
358358
# Make sure the provisioner OID is set so we can pass it through to the deployment.
359359
if (!$ProvisionerApplicationId -and !$ProvisionerApplicationOid) {
360360
if ($context.Account.Type -eq 'User') {
361-
# HomeAccountId format is '<object id>.<tenant id>'
362-
$userAccountId = (Get-AzContext).Account.ExtendedProperties.HomeAccountId.Split('.')[0]
361+
# Calls to graph API in corp tenant get blocked by conditional access policy now
362+
# but not in TME. For corp tenant we get the user's id from the login context
363+
# but for TME it is different so we have to source it from graph
364+
$userAccountId = if ($wellKnownTMETenants.Contains($TenantId)) {
365+
(Get-AzADUser -SignedIn).Id
366+
} else {
367+
# HomeAccountId format is '<object id>.<tenant id>'
368+
(Get-AzContext).Account.ExtendedProperties.HomeAccountId.Split('.')[0]
369+
}
363370
if ($null -eq $userAccountId) {
364371
throw "Failed to find entra object ID for the current user"
365372
}
@@ -430,12 +437,20 @@ try {
430437

431438
if (!$CI -and !$ServicePrincipalAuth) {
432439
if ($TestApplicationId) {
433-
Write-Warning "The specified TestApplicationId '$TestApplicationId' will be ignored when -ServicePrincipalAutth is not set."
440+
Write-Warning "The specified TestApplicationId '$TestApplicationId' will be ignored when -ServicePrincipalAuth is not set."
434441
}
435442

436443
$userAccountName = (Get-AzContext).Account.Id
437444
# HomeAccountId format is '<object id>.<tenant id>'
438-
$userAccountId = (Get-AzContext).Account.ExtendedProperties.HomeAccountId.Split('.')[0]
445+
# Calls to graph API in corp tenant get blocked by conditional access policy now
446+
# but not in TME. For corp tenant we get the user's id from the login context
447+
# but for TME it is different so we have to source it from graph
448+
$userAccountId = if ($wellKnownTMETenants.Contains($TenantId)) {
449+
(Get-AzADUser -SignedIn).Id
450+
} else {
451+
# HomeAccountId format is '<object id>.<tenant id>'
452+
(Get-AzContext).Account.ExtendedProperties.HomeAccountId.Split('.')[0]
453+
}
439454
if ($null -eq $userAccountId) {
440455
throw "Failed to find entra object ID for the current user"
441456
}

eng/common/instructions/azsdk-tools/validate-codeowners.instructions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
---
22
mode: 'agent'
3-
tools: ['azsdk_check_service_label', 'azsdk_engsys_validate_codeowners_entry_for_service', 'azsdk_engsys_codeowner_update']
3+
tools: ['azsdk_check_service_label', 'azsdk_engsys_validate_codeowners_entry_for_service', 'azsdk_engsys_codeowner_update']
44
---
55

6-
## Goal:
6+
## Goal:
77
Validate service label and ensure at least 2 valid code owners exist for SDK repositories.
88

99
## Step 1: Validate Service Label
1010
Use `azsdk_check_service_label` to verify the service label exists:
1111
- **DoesNotExist/NotAServiceLabel**: Direct user to create valid service label first. Stop validation process until service label is created.
1212
- **Exists/InReview**: Proceed to Step 2
1313

14-
## Step 2: Validate Code Owners
14+
## Step 2: Validate Code Owners
1515
Ask user to specify SDK repository they want to validate codeowners for or detect from context.
1616

1717
Repository name mapping:
1818
- .NET/dotnet: use "azure-sdk-for-net"
19-
- Python: use "azure-sdk-for-python"
19+
- Python: use "azure-sdk-for-python"
2020
- Java: use "azure-sdk-for-java"
2121
- JavaScript: use "azure-sdk-for-js"
2222
- Go: use "azure-sdk-for-go"
@@ -28,7 +28,7 @@ Use `azsdk_engsys_validate_codeowners_entry_for_service` with either `serviceLab
2828

2929
## Step 3: Check Existing Code Owners
3030
Valid code owners must be:
31-
- PUBLIC members of Microsoft and Azure GitHub organizations
31+
- PUBLIC members of Microsoft and Azure GitHub organizations
3232
- Have write access to the SDK repository
3333

3434
**If at least 2 valid owners**: Success - optionally add or delete additional owners
@@ -41,7 +41,7 @@ When no CODEOWNERS entry exists yet:
4141
1. Ensure you have the following information
4242
- repo - **Required** - Repository name mapping:
4343
- .NET/dotnet: use "azure-sdk-for-net"
44-
- Python: use "azure-sdk-for-python"
44+
- Python: use "azure-sdk-for-python"
4545
- Java: use "azure-sdk-for-java"
4646
- JavaScript: use "azure-sdk-for-js"
4747
- Go: use "azure-sdk-for-go"
@@ -71,4 +71,4 @@ When no CODEOWNERS entry exists yet:
7171
## Requirements
7272
- **MINIMUM**: At least 2 valid code owners at all times
7373
- **NO EXCEPTIONS**: Cannot proceed with insufficient owners
74-
- **RESPONSE HANDLING**: If any exception occurs during validation or creation, ALWAYS provide documentation link [Codeowners documentation](https://eng.ms/docs/products/azure-developer-experience/develop/supporting-sdk-customers/codeowners)
74+
- **RESPONSE HANDLING**: If any exception occurs during validation or creation, ALWAYS provide documentation link [CODEOWNERS documentation](https://eng.ms/docs/products/azure-developer-experience/develop/supporting-sdk-customers/codeowners)

eng/common/instructions/azsdk-tools/validate-service-label.instructions.md

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,53 @@
22
mode: 'agent'
33
tools: ['azsdk_check_service_label', 'azsdk_create_service_label']
44
---
5-
5+
66
## Goal
77
Validate service label exists or create new one for SDK release process.
8-
9-
## Step 1: Get Service Label
10-
Ask user for their service label. If none provided, explain that a valid service label is required for SDK release.
11-
12-
## Step 2: Validate Label
8+
9+
## Step 1: Provide Information
10+
11+
Provide the following information about the importance of service labels:
12+
13+
"Before your SDK is released, your service must have a valid service label in the Azure SDK repositories. Service labels enable automatic owner assignment and notifications across the Azure SDK ecosystem.
14+
15+
When properly configured, service labels automatically:
16+
17+
- Notify service owners when issues are filed against their SDK
18+
- Add appropriate reviewers to pull requests
19+
- Connect code changes to the right team members through CODEOWNERS integration
20+
21+
Without a valid service label, the process to identify the correct service owners for issues and code reviews becomes manual and inefficient."
22+
23+
## Step 2: Get Service Label
24+
25+
Ask user for their service label. If they don't know their service label provide guidance:
26+
27+
- Check out the [Common Labels CSV](https://github.com/Azure/azure-sdk-tools/blob/main/tools/github/data/common-labels.csv) file and look for a row whose first column contains your service's product name.
28+
29+
If they don't have a service label - go to Step 3 for new service label
30+
31+
## Step 3: Validate Label
32+
1333
Use `azsdk_check_service_label` to check status:
14-
34+
1535
- **Exists**: Success - user can proceed with next steps in SDK release process
1636
- **InReview**: Label pending approval - user can proceed (will be available once merged)
1737
- **DoesNotExist**: Go to Step 3 to create new label
1838
- **NotAServiceLabel**: Label exists but it is not a service label - go to Step 3 for new service label
19-
20-
## Step 3: Create New Service Label
39+
40+
## Step 4: Create New Service Label
41+
2142
If no valid service label exists, guide the user through creating a new one.
22-
43+
2344
1. **Check existing labels**: Search for related service labels, offer alternatives
2445
2. **Generate recommendation**: Suggest label name following guidelines:
46+
- Should match the service's official product name as described on Service Tree (e.g., "Event Hubs", "Kusto", "Cosmos", etc.)
2547
- No "Microsoft/Azure" in name
2648
- Title Case (except short prepositions)
2749
- Avoid Service Groups: Use "Communication Rooms" instead of "Communication - Rooms"
2850
- Single label per service
2951
3. **Get confirmation**: User confirms or modifies suggested name
3052
4. **Create label**: Use `azsdk_create_service_label` with confirmed name and documentation link given by user
31-
32-
Inform user they can proceed.
53+
54+
Inform user they can proceed.

eng/http-client-csharp-emitter-package-lock.json

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

0 commit comments

Comments
 (0)