Merge branch 'main' into fix/keyvault-certificates-san-ip-uri-validator

Author: rohitsinghal4u

.github/CODEOWNERS

@@ -859,8 +859,8 @@
 /eng/pipelines/docindex.yml                                          @danieljurek @scbedd @weshaggard @benbp
 
 # Add approvers for typespec-python emitter version updates
-/eng/emitter-package.json                                            @mccoyp @catalinaperalta @iscai-msft
-/eng/emitter-package-lock.json                                       @mccoyp @catalinaperalta @iscai-msft
+/eng/emitter-package.json                                            @mccoyp @catalinaperalta @iscai-msft @msyyc @ChenxiJiang333
+/eng/emitter-package-lock.json                                       @mccoyp @catalinaperalta @iscai-msft @msyyc @ChenxiJiang333
 
 /pylintrc                                                            @l0lawrence @scbedd @mccoyp
 /sdk/**/ci.yml                                                       @msyyc @lmazuel @scbedd

eng/emitter-package-lock.json

@@ -16,10 +16,10 @@
     "@typespec/openapi3": "1.11.0",
     "@azure-tools/openai-typespec": "1.11.0",
     "@azure-tools/typespec-autorest": "~0.67.0",
-    "@azure-tools/typespec-azure-core": "~0.67.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.67.0",
+    "@azure-tools/typespec-azure-core": "~0.67.1",
+    "@azure-tools/typespec-azure-resource-manager": "~0.67.1",
     "@azure-tools/typespec-azure-rulesets": "~0.67.0",
-    "@azure-tools/typespec-client-generator-core": "~0.67.1",
+    "@azure-tools/typespec-client-generator-core": "~0.67.3",
     "@azure-tools/typespec-liftr-base": "0.13.0"
   }
 }

eng/emitter-package.json

@@ -219,7 +219,7 @@ def main(generate_input, generate_output):
                 Path(sdk_code_path).absolute(),
                 enable_changelog=data.get("enableChangelog", True),
                 package_result=result[package_name],
-                timeout=1800 if data.get("runMode") in ["spec-pull-request"] else 7200,
+                timeout=900 if data.get("runMode") in ["spec-pull-request"] else 7200,
             )
 
             # update version in _version.py and CHANGELOG.md

eng/tools/azure-sdk-tools/packaging_tools/sdk_generator.py

@@ -1,17 +1,21 @@
 # Release History
 
-## 2.0.0b3 (Unreleased)
+## 2.0.0b4 (Unreleased)
 
 ### Features Added
 
-- `RequestIdMiddleware` — pure-ASGI middleware that sets an `x-request-id` response header on every response. The request ID is resolved from the OpenTelemetry trace ID, an incoming `x-request-id` header, or a generated UUID (in that priority). The resolved value is stored in ASGI scope state under the well-known key `agentserver.request_id` for use by sibling protocol packages. Automatically wired into `AgentServerHost`.
-
 ### Breaking Changes
 
 ### Bugs Fixed
 
 ### Other Changes
 
+## 2.0.0b3 (2026-04-22)
+
+### Features Added
+
+- `RequestIdMiddleware` — pure-ASGI middleware that sets an `x-request-id` response header on every response. The request ID is resolved from the OpenTelemetry trace ID, an incoming `x-request-id` header, or a generated UUID (in that priority). The resolved value is stored in ASGI scope state under the well-known key `agentserver.request_id` for use by sibling protocol packages. Automatically wired into `AgentServerHost`.
+
 ## 2.0.0b2 (2026-04-17)
 
 ### Features Added

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

@@ -2,4 +2,4 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
 
-VERSION = "2.0.0b3"
+VERSION = "2.0.0b4"

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

@@ -7,8 +7,9 @@ RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
 
 # Install base packages from Azure DevOps feed FIRST (separate pip call
 # to avoid the feed interfering with github-copilot-sdk from PyPI).
+# Uses --index-url (not --extra-index-url) to satisfy CFS supply-chain policy.
 RUN pip install --no-cache-dir --no-input --pre \
-    --extra-index-url https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/ \
+    --index-url https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/ \
     "azure-ai-agentserver-core>=2.0.0a1" \
     "azure-ai-agentserver-responses>=1.0.0a1"