Skip to content

Commit d853705

Browse files
Merge remote-tracking branch 'upstream/main' into wangamber/transcription
2 parents 0c1248b + d1d6269 commit d853705

File tree

5,463 files changed

+221155
-183703
lines changed

Some content is hidden

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

5,463 files changed

+221155
-183703
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@
8383
# ServiceOwners: @mojayara @Prasanna-Padmanabhan
8484

8585
# PRLabel: %AI
86-
/sdk/ai/ @dargilco @jhakulin @jpalvarezl @Azure/azure-java-sdk
86+
/sdk/ai/ @dargilco @trrwilson @jpalvarezl @Azure/azure-java-sdk
8787

8888
# PRLabel: %AI Agents
89-
/sdk/ai/azure-ai-agents-persistent/ @dargilco @jhakulin @jayantjha @Azure/azure-java-sdk
89+
/sdk/ai/azure-ai-agents-persistent/ @dargilco @trrwilson @jayantjha @Azure/azure-java-sdk
9090

9191
# PRLabel: %AI Model Inference
92-
/sdk/ai/azure-ai-inference/ @dargilco @jhakulin @glharper @Azure/azure-java-sdk
92+
/sdk/ai/azure-ai-inference/ @dargilco @trrwilson @glharper @Azure/azure-java-sdk
9393

9494
# PRLabel: %Voice Live
95-
/sdk/ai/azure-ai-voicelive/ @rhurey @xitzhang
95+
/sdk/ai/azure-ai-voicelive/ @rhurey @xitzhang @amber-yujueWang
9696

9797
# ServiceLabel: %AKS
9898
# ServiceOwners: @Azure/aks-pm
@@ -107,7 +107,7 @@
107107
# ServiceOwners: @miaojiang
108108

109109
# PRLabel: %App Configuration
110-
/sdk/appconfiguration/ @alzimmermsft @Azure/azure-java-sdk
110+
/sdk/appconfiguration/ @mrm9084 @rossgrambo @avanigupta @alzimmermsft @Azure/azure-java-sdk
111111

112112
# ServiceLabel: %App Configuration
113113
# AzureSdkOwners: @mrm9084
@@ -925,7 +925,7 @@
925925
/common/perf-test-core/ @alzimmermsft @srnagar @g2vinay @Azure/azure-java-sdk
926926

927927
# PRLabel: %common
928-
/.vscode/ @alzimmermsft @srnagar @g2vinay @conniey @rujche @netyyyy @saragluna @moarychan @Azure/azure-java-sdk
928+
/.vscode/ @alzimmermsft @srnagar @g2vinay @conniey @rujche @netyyyy @saragluna @moarychan @Azure/azure-java-sdk @raych1
929929

930930
# ServiceLabel: %common
931931
# AzureSdkOwners: @alzimmermsft @srnagar

.vscode/cspell.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,9 @@
877877
"words": [
878878
"Dexec",
879879
"viseme",
880-
"VISEME"
880+
"VISEME",
881+
"webrtc",
882+
"WEBRTC"
881883
]
882884
},
883885
{

eng/.docsettings.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ required_readme_sections:
3131
- ^Next steps$
3232
- ^Contributing$
3333
known_presence_issues:
34-
- ['sdk/mediaservices/microsoft-azure-media', '#2847']
3534
- ['sdk/servicebus/microsoft-azure-servicebus', '#2847']
3635
# Changelog List
3736
- ['sdk/authorization/microsoft-azure-authentication-msi-token-provider/CHANGELOG.md', '#2847']
@@ -48,7 +47,6 @@ known_presence_issues:
4847
- ['sdk/keyvault/microsoft-azure-keyvault-extensions/CHANGELOG.md', '#2847']
4948
- ['sdk/keyvault/microsoft-azure-keyvault-webkey/CHANGELOG.md', '#2847']
5049
- ['sdk/keyvault/microsoft-azure-keyvault-test/CHANGELOG.md', '#2847']
51-
- ['sdk/mediaservices/microsoft-azure-media/CHANGELOG.md', '#2847']
5250
- ['sdk/servicebus/microsoft-azure-servicebus/CHANGELOG.md', '#2847']
5351
- ['sdk/keyvault/microsoft-azure-keyvault-complete/CHANGELOG.md', '#2847']
5452

eng/automation/generate.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
328328
update_service_files_for_new_lib(sdk_root, service, GROUP_ID, module)
329329
update_root_pom(sdk_root, service)
330330

331+
# get the stable version and current version from version_client.txt, current version in version_client will be updated if the release type is GA.
332+
# e.g. If current version is 1.2.0-beta.1 and the release type is GA, then current version will be updated to 1.2.0
331333
stable_version, current_version = set_or_increase_version(sdk_root, GROUP_ID, module, preview=release_beta_sdk)
332334
update_parameters(None)
333335
output_folder = OUTPUT_FOLDER_FORMAT.format(service)
@@ -339,6 +341,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
339341
if is_mgmt_premium(module):
340342
move_premium_samples(sdk_root, service, module)
341343
update_azure_resourcemanager_pom(sdk_root, module, current_version)
344+
# For output breaking changes, useful in sdk validation pipeline
342345
logging.info("[Changelog] Start breaking change detection for SDK automation.")
343346
breaking, changelog, breaking_change_items = compare_with_maven_package(
344347
sdk_root,
@@ -349,6 +352,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
349352
module,
350353
)
351354
logging.info("[Changelog] Complete breaking change detection for SDK automation.")
355+
# For changelog content update
352356
logging.info("[Changelog] Start generating changelog.")
353357
compare_with_maven_package(
354358
sdk_root,

eng/automation/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def set_or_increase_version(
373373
def is_windows():
374374
return platform.system().lower() == "windows"
375375

376-
376+
# Get the latest release version based on current version. If current version is beta, get latest beta version; if current version is GA, get latest GA version.
377377
def get_latest_release_version(previous_version: str, current_version: str) -> str:
378378
if "-beta." in current_version and "-beta." not in previous_version:
379379
# if current version is preview, try compare it with a previous preview release

eng/common/instructions/azsdk-tools/verify-setup.instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ The user can specify multiple languages to check. If the user wants to check all
1616
## Output
1717
Display results in a user-friendly and concise format, highlighting any missing dependencies that need to be addressed and how to resolve them.
1818

19-
WHENEVER Python related requirements fail, ALWAYS ASK the user if they have set the `AZSDKTOOLS_PYTHON_VENV_PATH` system environment variable to their desired virtual environment. This tool can only check requirements in the venv path specified by that environment variable.
19+
When Python tool requirements fail, inform the user about the `AZSDKTOOLS_PYTHON_VENV_PATH` environment variable if they have setup issues. The verify-setup tool can only check Python requirements within the virtual environment specified by this environment variable.
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
trigger: none
2+
3+
pr:
4+
branches:
5+
include:
6+
- main
7+
paths:
8+
include:
9+
- .github/copilot-instructions.md
10+
- eng/common/instructions/azsdk-tools/**
11+
12+
parameters:
13+
- name: EvalProject
14+
type: string
15+
default: 'tools/azsdk-cli/Azure.Sdk.Tools.Cli.Evaluations'
16+
- name: OpenAIEndPoint
17+
type: string
18+
default: 'https://ai-prmarottai3149546654251245.openai.azure.com/'
19+
- name: Model
20+
type: string
21+
default: 'gpt-5'
22+
- name: ToolsRepoName
23+
type: string
24+
default: 'azure-sdk-tools'
25+
- name: ToolsRepoOwner
26+
type: string
27+
default: 'Azure'
28+
29+
jobs:
30+
- job: Run_Eval
31+
variables:
32+
- template: /eng/pipelines/templates/variables/globals.yml
33+
- template: /eng/pipelines/templates/variables/image.yml
34+
displayName: 'Run AI Eval'
35+
pool:
36+
name: $(LINUXPOOL)
37+
image: $(LINUXVMIMAGE)
38+
os: linux
39+
40+
steps:
41+
- task: UseDotNet@2
42+
displayName: "Use .NET SDK 9.0.x"
43+
retryCountOnTaskFailure: 3
44+
inputs:
45+
packageType: sdk
46+
version: 9.0.x
47+
performMultiLevelLookup: true
48+
49+
- task: UseDotNet@2
50+
displayName: "Use .NET SDK 8.0.x"
51+
retryCountOnTaskFailure: 3
52+
inputs:
53+
packageType: sdk
54+
version: 8.0.x
55+
performMultiLevelLookup: true
56+
57+
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
58+
parameters:
59+
SkipCheckoutNone: true
60+
Repositories:
61+
- Name: $(Build.Repository.Name)
62+
Commitish: $(Build.SourceVersion)
63+
WorkingDirectory: $(System.DefaultWorkingDirectory)/$(Build.Repository.Name)
64+
- Name: ${{ parameters.ToolsRepoOwner }}/${{ parameters.ToolsRepoName }}
65+
WorkingDirectory: $(System.DefaultWorkingDirectory)/${{ parameters.ToolsRepoName }}
66+
Paths:
67+
- 'tools/**'
68+
- eng/common/**
69+
- .github/copilot-instructions.md
70+
71+
- task: AzureCLI@2
72+
displayName: 'Run eval'
73+
inputs:
74+
azureSubscription: opensource-api-connection
75+
scriptType: 'bash'
76+
scriptLocation: 'inlineScript'
77+
workingDirectory: '${{ parameters.ToolsRepoName }}/${{ parameters.EvalProject }}'
78+
inlineScript: |
79+
echo "Logged in to Azure"
80+
echo "Running eval in project ${{ parameters.ToolsRepoName }}/${{ parameters.EvalProject }}"
81+
dotnet test /p:ArtifactsPackagesDir=$(Build.ArtifactStagingDirectory) --logger trx
82+
env:
83+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
84+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
85+
DOTNET_MULTILEVEL_LOOKUP: 0
86+
AZURE_OPENAI_MODEL_DEPLOYMENT_NAME: ${{ parameters.Model }}
87+
AZURE_OPENAI_ENDPOINT: ${{ parameters.OpenAIEndPoint }}
88+
REPOSITORY_NAME: $(Build.Repository.Name)
89+
COPILOT_INSTRUCTIONS_PATH_MCP_EVALS: $(System.DefaultWorkingDirectory)/$(Build.Repository.Name)/.github/copilot-instructions.md
90+
91+
- task: PublishTestResults@2
92+
condition: succeededOrFailed()
93+
inputs:
94+
testResultsFiles: '**/*.trx'
95+
testRunTitle: $(System.JobDisplayName)
96+
testResultsFormat: 'VSTest'
97+
mergeTestResults: true

eng/common/pipelines/templates/steps/check-spelling.yml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,28 @@
22
# and some ref (branch, tag, etc.) or commit hash. Only runs on PRs.
33
# ContinueOnError - true: Pipeline warns on spelling error
44
# false: Pipeline fails on spelling error
5-
# TargetBranch - Target ref (e.g. main) to compare to create file change
6-
# list.
75
# CspellConfigPath - Path to cspell.json config location
86
#
7+
# ScriptToValidateUpgrade - Optional script to validate cspell upgrade. This
8+
# is invoked only if package-lock.json for cspell is
9+
# changed. This script should exit with a nonzero exit
10+
# code if the upgrade is invalid. Upgrade check should
11+
# check for errors which would prevent release (i.e.
12+
# public API surface).
13+
#
914
# This check recognizes the setting of variable "Skip.SpellCheck"
1015
# if set to 'true', spellchecking will not be invoked.
1116

1217
parameters:
13-
ContinueOnError: true
14-
CspellConfigPath: ./.vscode/cspell.json
18+
- name: ContinueOnError
19+
type: boolean
20+
default: true
21+
- name: CspellConfigPath
22+
type: string
23+
default: ./.vscode/cspell.json
24+
- name: ScriptToValidateUpgrade
25+
type: string
26+
default: ''
1527

1628
steps:
1729
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
@@ -26,3 +38,16 @@ steps:
2638
-CspellConfigPath ${{ parameters.CspellConfigPath }}
2739
-ExitWithError:(!$${{ parameters.ContinueOnError }})
2840
pwsh: true
41+
- ${{ if ne('', parameters.ScriptToValidateUpgrade) }}:
42+
- pwsh: |
43+
$changedFiles = ./eng/common/scripts/get-changedfiles.ps1
44+
45+
if ($changedFiles -notcontains 'eng/common/spelling/package-lock.json') {
46+
Write-Host "No changes to cspell package-lock.json detected."
47+
exit 0
48+
}
49+
50+
Write-Host "Detected change to cspell package-lock.json. Running upgrade verification."
51+
& '${{ parameters.ScriptToValidateUpgrade }}'
52+
displayName: Verify cspell upgrade
53+
condition: and(succeeded(), ne('true', variables['Skip.SpellCheck']))

eng/common/pipelines/templates/steps/create-apireview.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ steps:
4040
- task: Powershell@2
4141
inputs:
4242
filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
43+
# PackageInfoFiles example: @('a/file1.json','a/file2.json')
4344
arguments: >
44-
-PackageInfoFiles ('${{ convertToJson(parameters.PackageInfoFiles) }}' | ConvertFrom-Json -NoEnumerate)
45+
-PackageInfoFiles @('${{ join(''',''', parameters.PackageInfoFiles) }}')
4546
-ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
4647
-ArtifactPath '${{parameters.ArtifactPath}}'
4748
-ArtifactName ${{ parameters.ArtifactName }}

eng/common/pipelines/templates/steps/validate-all-packages.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ steps:
2424
azureSubscription: opensource-api-connection
2525
scriptType: pscore
2626
scriptLocation: inlineScript
27+
# PackageInfoFiles example: @('a/file1.json','a/file2.json')
2728
inlineScript: |
2829
$(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 `
2930
-ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) `
@@ -34,7 +35,7 @@ steps:
3435
-BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) `
3536
-PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) `
3637
-IsReleaseBuild $$(SetAsReleaseBuild) `
37-
-PackageInfoFiles ('${{ convertToJson(parameters.PackageInfoFiles) }}' | ConvertFrom-Json -NoEnumerate)
38+
-PackageInfoFiles @('${{ join(''',''', parameters.PackageInfoFiles) }}')
3839
workingDirectory: $(Pipeline.Workspace)
3940
displayName: Validate packages and update work items
4041
continueOnError: true

0 commit comments

Comments
 (0)