Skip to content

Commit df23146

Browse files
authored
Merge branch 'main' into CopySharedCode
2 parents 8dc3704 + c5e85bf commit df23146

736 files changed

Lines changed: 134019 additions & 74298 deletions

File tree

Some content is hidden

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

.github/actionlint.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
self-hosted-runner:
22
labels:
33
- 1ES.Pool=azsdk-pool-github-runners
4-
- azsdk-pool-github-test
5-
- azsdk-pool-github-test-pr
6-
7-
paths:
8-
.github/workflows/*.lock.yml:
9-
ignore:
10-
- ".+"

.github/workflows/actionlint.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Actionlint
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- .github/**
9+
pull_request:
10+
paths:
11+
- .github/**
12+
workflow_dispatch:
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
test:
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v6
24+
with:
25+
sparse-checkout: |
26+
.github
27+
28+
# Content copied from https://raw.githubusercontent.com/rhysd/actionlint/2ab3a12c7848f6c15faca9a92612ef4261d0e370/.github/actionlint-matcher.json
29+
- name: Add ActionLint Problem Matcher
30+
run: echo "::add-matcher::.github/matchers/actionlint.json"
31+
32+
- name: Lint workflows
33+
uses: docker://rhysd/actionlint:1.7.12@sha256:b1934ee5f1c509618f2508e6eb47ee0d3520686341fec936f3b79331f9315667
34+
with:
35+
args: -color -verbose

.github/workflows/azure-sdk-tools.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
build-and-test:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v6
1616

1717
- name: Set up Python 3.13
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: 3.13
2121

@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install azure-sdk-tools
2626
run: |
27-
python -m pip install -e eng/tools/azure-sdk-tools[ghtools,conda]
27+
python -m pip install -e 'eng/tools/azure-sdk-tools[ghtools,conda]'
2828
python -m pip freeze
2929
shell: bash
3030

@@ -37,10 +37,10 @@ jobs:
3737
static-analysis:
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v6
4141

4242
- name: Set up Python 3.13
43-
uses: actions/setup-python@v4
43+
uses: actions/setup-python@v6
4444
with:
4545
python-version: 3.13
4646

@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Install azure-sdk-tools
5151
run: |
52-
python -m pip install -e eng/tools/azure-sdk-tools[ghtools,conda]
52+
python -m pip install -e 'eng/tools/azure-sdk-tools[ghtools,conda]'
5353
python -m pip install black==24.4.0
5454
python -m pip freeze
5555
shell: bash
@@ -62,10 +62,10 @@ jobs:
6262
verify-azpysdk-checks:
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/checkout@v2
65+
- uses: actions/checkout@v6
6666

6767
- name: Set up Python 3.13
68-
uses: actions/setup-python@v4
68+
uses: actions/setup-python@v6
6969
with:
7070
python-version: 3.13
7171

@@ -79,7 +79,7 @@ jobs:
7979

8080
- name: Install azure-sdk-tools on in global uv, discover azpysdk checks
8181
run: |
82-
uv pip install --system -e eng/tools/azure-sdk-tools[ghtools,conda,systemperf]
82+
uv pip install --system -e 'eng/tools/azure-sdk-tools[ghtools,conda,systemperf]'
8383
8484
# Discover available azpysdk commands from the {command1,command2,...} line in help output
8585
CHECKS=$(azpysdk -h 2>&1 | \
@@ -102,20 +102,20 @@ jobs:
102102

103103
- name: Run all discovered checks against azure-template using uv as package manager
104104
run: |
105-
sdk_build azure-template -d $(pwd)/wheels --build_id 20250101.1
106-
python eng/scripts/dispatch_checks.py --checks "$AZPYSDK_CHECKS" --wheel_dir $(pwd)/wheels azure-template
105+
sdk_build azure-template -d "$(pwd)/wheels" --build_id 20250101.1
106+
python eng/scripts/dispatch_checks.py --checks "$AZPYSDK_CHECKS" --wheel_dir "$(pwd)/wheels" azure-template
107107
shell: bash
108108
env:
109109
AZPYSDK_PIP_IMPL: "uv"
110110

111111
- name: Install azure-sdk-tools on global pip env
112112
run: |
113-
python -m pip install -e eng/tools/azure-sdk-tools[ghtools,conda]
113+
python -m pip install -e 'eng/tools/azure-sdk-tools[ghtools,conda]'
114114
shell: bash
115115

116116
- name: Run all discovered checks against azure-template using pip as package manager
117117
run: |
118-
python eng/scripts/dispatch_checks.py --checks "$AZPYSDK_CHECKS" --wheel_dir $(pwd)/wheels azure-template
118+
python eng/scripts/dispatch_checks.py --checks "$AZPYSDK_CHECKS" --wheel_dir "$(pwd)/wheels" azure-template
119119
shell: bash
120120
env:
121121
AZPYSDK_PIP_IMPL: "pip"

.github/workflows/copilot-setup-steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111

1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515

1616
- name: Setup Python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: '3.10'
2020
cache: 'pip'
@@ -23,8 +23,8 @@ jobs:
2323
run: |
2424
python -m venv .venv
2525
source .venv/bin/activate
26-
echo "VIRTUAL_ENV=$(pwd)/.venv" >> $GITHUB_ENV
27-
echo "$(pwd)/.venv/bin" >> $GITHUB_PATH
26+
echo "VIRTUAL_ENV=$(pwd)/.venv" >> "$GITHUB_ENV"
27+
echo "$(pwd)/.venv/bin" >> "$GITHUB_PATH"
2828
2929
- name: Install Dependencies
3030
run: |

.github/workflows/dependency-checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v6
1717

1818
- name: Set up Python
19-
uses: actions/setup-python@v4
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: 3.11
2222

.github/workflows/typespec-python-regenerate.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,13 @@ jobs:
8080
exit 1
8181
fi
8282
83-
echo "typespec_repo=$REPO" >> $GITHUB_OUTPUT
84-
echo "typespec_ref=$REF" >> $GITHUB_OUTPUT
85-
echo "typespec_display_ref=$DISPLAY_REF" >> $GITHUB_OUTPUT
86-
echo "typespec_ref_url=$REF_URL" >> $GITHUB_OUTPUT
87-
echo "typespec_pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
83+
{
84+
echo "typespec_repo=$REPO"
85+
echo "typespec_ref=$REF"
86+
echo "typespec_display_ref=$DISPLAY_REF"
87+
echo "typespec_ref_url=$REF_URL"
88+
echo "typespec_pr_number=$PR_NUMBER"
89+
} >> "$GITHUB_OUTPUT"
8890
echo "::notice::Regenerating from ${REPO}@${DISPLAY_REF}"
8991
9092
- name: Checkout microsoft/typespec
@@ -206,7 +208,9 @@ jobs:
206208
207209
# Restore regenerated files from the temp dir.
208210
mkdir -p "$GENERATED_DIR"
209-
rm -rf "$GENERATED_DIR"/*
211+
# Use ${var:?} so that if GENERATED_DIR is empty, the command aborts
212+
# instead of expanding to "rm -rf /*" and deleting the filesystem.
213+
rm -rf "${GENERATED_DIR:?}"/*
210214
cp -r "$TMPDIR"/. "$GENERATED_DIR"
211215
rm -rf "$TMPDIR"
212216
git add -f "$GENERATED_DIR"/

.vscode/cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
"conda/conda-recipes/uamqp/meta.yaml",
143143
"conda/conda-releaselogs/azure-mgmt.md",
144144
".github/workflows/azure-sdk-tools.yml",
145+
".github/workflows/actionlint.yml",
145146
"sdk/ai/azure-ai-voicelive/azure/ai/voicelive/models/_*.py",
146147
"sdk/ai/azure-ai-voicelive/samples/**"
147148
],

eng/common/pipelines/templates/steps/update-docsms-metadata.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ steps:
103103
${{ if ne(parameters.NpmConfigRegistry, '') }}:
104104
npm_config_registry: ${{ parameters.NpmConfigRegistry }}
105105
106+
- template: /eng/common/pipelines/templates/steps/login-to-github.yml
107+
parameters:
108+
TokenOwners:
109+
- ${{ parameters.TargetDocRepoOwner }}
110+
ScriptDirectory: ${{ parameters.ScriptDirectory }}
106111
- template: /eng/common/pipelines/templates/steps/git-push-changes.yml
107112
parameters:
108113
BaseRepoBranch: $(TargetBranchName)
@@ -112,3 +117,5 @@ steps:
112117
TargetRepoOwner: ${{ parameters.TargetDocRepoOwner }}
113118
WorkingDirectory: $(DocRepoLocation)
114119
ScriptDirectory: ${{ parameters.WorkingDirectory }}/${{ parameters.ScriptDirectory }}
120+
AuthToken: $(GH_TOKEN)
121+

sdk/agentserver/azure-ai-agentserver-core/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Release History
22

3+
## 2.0.0b6 (2026-06-12)
4+
5+
### Bugs Fixed
6+
7+
- Populated agent metadata when operation IDs are zeroed so agent metadata remains available for telemetry and downstream processing.
8+
- Suppressed noisy observability/exporter INFO logs by default in tracing setup while preserving DEBUG visibility when explicitly enabled.
9+
310
## 2.0.0b5 (2026-05-25)
411

512
### Bugs Fixed

sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_config.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,15 @@ def resolve_project_id() -> str:
345345
return os.environ.get(_ENV_FOUNDRY_PROJECT_ARM_ID, "")
346346

347347

348+
def resolve_session_id() -> str:
349+
"""Resolve the default session ID from the ``FOUNDRY_AGENT_SESSION_ID`` environment variable.
350+
351+
:return: The default session ID, or an empty string if not set.
352+
:rtype: str
353+
"""
354+
return os.environ.get(_ENV_FOUNDRY_AGENT_SESSION_ID, "")
355+
356+
348357
def resolve_sse_keepalive_interval(interval: Optional[int] = None) -> int:
349358
"""Resolve the SSE keep-alive interval from argument, env var, or default.
350359

0 commit comments

Comments
 (0)