Resolve merge conflicts in Network 2025-07-01 release#42709
Closed
santoshgh317 wants to merge 357 commits into
Closed
Resolve merge conflicts in Network 2025-07-01 release#42709santoshgh317 wants to merge 357 commits into
santoshgh317 wants to merge 357 commits into
Conversation
…2116) Bumps [@apidevtools/json-schema-ref-parser](https://github.com/APIDevTools/json-schema-ref-parser) from 15.3.2 to 15.3.4. - [Release notes](https://github.com/APIDevTools/json-schema-ref-parser/releases) - [Commits](APIDevTools/json-schema-ref-parser@v15.3.2...v15.3.4) --- updated-dependencies: - dependency-name: "@apidevtools/json-schema-ref-parser" dependency-version: 15.3.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…red (#42117) Bumps [@apidevtools/json-schema-ref-parser](https://github.com/APIDevTools/json-schema-ref-parser) from 15.3.2 to 15.3.4. - [Release notes](https://github.com/APIDevTools/json-schema-ref-parser/releases) - [Commits](APIDevTools/json-schema-ref-parser@v15.3.2...v15.3.4) --- updated-dependencies: - dependency-name: "@apidevtools/json-schema-ref-parser" dependency-version: 15.3.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
) Bumps the typespec-client-generator-cli group with 1 update in the / directory: [@azure-tools/typespec-client-generator-cli](https://github.com/Azure/azure-sdk-tools). Updates `@azure-tools/typespec-client-generator-cli` from 0.31.0 to 0.32.0 - [Release notes](https://github.com/Azure/azure-sdk-tools/releases) - [Commits](https://github.com/Azure/azure-sdk-tools/commits) --- updated-dependencies: - dependency-name: "@azure-tools/typespec-client-generator-cli" dependency-version: 0.32.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: typespec-client-generator-cli ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.2/packages/coverage-v8) --- updated-dependencies: - dependency-name: "@vitest/coverage-v8" dependency-version: 4.1.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Cat's migration * Remove op group interface * Remove Enum suffix from generated models * Add missing operation IDs in examples * Remove manual operation ID setters; client customization flattening * Stable API version; Remove newlines in docstrings * Add docstrings; remove newlines; restore 2025-01-01 swagger * Auth naming alignment * Comment fix * Compile * Prettier * Common directory * stable/2023-06-01 common * Sync common * Revert ISO casing * Example copyrightUrl casing update * Remove unused import * Remove preview version * min/maxItems * Remove unnecessary added decorators * Remove changes to preview version * Remove hardcoded API version references in docs * x-ms-client-id * Add minItems and maxItems for rest * Remove preview disclaimers --------- Co-authored-by: catalinaperalta <caperal@microsoft.com>
* Migrate Weather * Add common file * AlertDetails -> AlertArea * Auth naming alignment * Prettier * Cspell * preview/1.0 common * Weather interface to match operation IDs
* Migrate Traffic * Auth naming alignment * Common directory * client.tsp cleanup * Prettier * stable/2023-06-01 common * Sync common * Traffic interface to match operation ID * Optional coordinates; remove unnecessary imports * Sync common
* Migrate Timezone * Fix casing * Update client customization * Auth naming alignment * Prettier * Common directory * Interface and client customizations * Example mapping * preview/1.0 common * Sync common * Manually align operation IDs * camelCase properties in examples * More example casing fixes * More casing fixes
* Cat's migration * Add common directory * Sync common * Auth naming alignment --------- Co-authored-by: catalinaperalta <caperal@microsoft.com>
* Cat's migration * Client customizations * Compile swagger * Auth naming alignment * Common directory * tsp compile * preview/1.0 common * Sync common --------- Co-authored-by: catalinaperalta <caperal@microsoft.com>
* Cat's migration * Correct subscription key location * npx tsv * Authentication comments * Name alignment * Common directory * preview/1.0 common * Sync common * Interface for operation ID * Manually make operation ID casing match --------- Co-authored-by: catalinaperalta <caperal@microsoft.com>
#42139) * Update Batch API documentation to specify ISO 8601 format for duration fields * Run tsp compile --------- Co-authored-by: Hoppe Wang <hoppewang@microsoft.com>
* finished routes * models * pull models and routes into client.tsp * tsp compile queues, revert blobs because in feature branch * regenerate * Queue suppression * scope down suppression * whiteline nit
* Initial empty commit * Add AutoProject fix directory structure and resolve some review comments fix type spec check fix arm-types-dir fix CI SdkTspConfigValidation fix CI checks fix CI Lint issues fix CI lint issues fix known false positive in azure-openapi-validator refactor: move autoApps from embedded property to dedicated listAutoApps action - Remove autoApps array from AutoProjectProperties (no longer on every GET/LIST) - Add listAutoApps POST action on AutoProject to query managed ContainerApps on demand - Add AutoAppListResult response model with pagination support - Note: managedBy is implemented by Microsoft.App, not Microsoft.Logic - Update all examples and design doc accordingly remove AutoApp models and listAutoApps action AutoProject does not own knowledge of which apps it manages. The managedBy property on ContainerApps is implemented by Microsoft.App. Discovery of managed apps is done via ARM mechanisms (e.g. Resource Graph). Adding example changes * Regenerate example files to match tsp compile output * Rename swagger output from logic.json to autoproject.json to avoid false cross-version breaking change * Rename AutoProject to AutomationProject across TypeSpec, examples, and generated swagger * Change API version from 2026-01-01-preview to 2026-04-01-preview * Remove createdTime and changedTime properties from AutomationProject ARM systemData (common-types v6) automatically provides createdAt/lastModifiedAt on every resource, making custom timestamp properties redundant. * Replace InProgress with Provisioning + Updating in provisioningState Per ARM RPC guidelines, use specific in-progress states instead of generic InProgress. Adds Provisioning (for create) and Updating (for update/patch) alongside existing Deleting, Succeeded, Failed, Canceled. * Add maxLength(1024) to description property * Add systemData to all example response bodies ARM requires systemData (createdBy, createdAt, lastModifiedBy, lastModifiedAt) in all resource responses. Added to Get, CreateOrUpdate (200+201), Update, ListByResourceGroup, and ListBySubscription examples. * Add missing LRO headers to async example responses - CreateOrUpdate 201: Added Azure-AsyncOperation + Retry-After headers - Update 202: Added Retry-After header - Delete 202: Added Retry-After header * Add minLength(2) and maxLength(64) to resource name parameter * Address Copilot PR review comments: update DESIGN.md, add C# emitter, remove unnecessary suppression * Restore ProvisioningStateMustBeReadOnly suppression - required for Spectral linter false positive * Reduce automation project name maxLength from 64 to 32 characters --------- Co-authored-by: Sandip Shahane <sandipsh@microsoft.com>
* Add instruction to improve azure-typespec-author skill invocation rate Add guidance in copilot-instructions.md to prompt users for confirmation when a request may involve TypeSpec authoring but is ambiguous, improving the skill invocation rate for the azure-typespec-author skill. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * update prompts * fix comment * update prompts * update prompts --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Add C# naming fixes for StorageMover SDK review comments Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix S3WithHmacSourceType clientName: remove invalid members, add missing ones --------- Co-authored-by: Suyash Choudhary <choudharysu@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…PRs (#42076) * Add Spectre - AI architecture review agent Spectre (👻) is an AI-powered architecture review agent that reviews API specification PRs for design compliance with Azure REST API Guidelines, Service Design Considerations, and patterns mined from historical reviewer feedback. Guidelines prompt compiled from: - 6,483 review threads across 1,226 PRs (Jan 2024 - Mar 2026) - 949 semantic clusters distilled into actionable rules - Official Azure REST API Guidelines (122 canonical DO/DON'T rules) - Considerations for Service Design (naming, resiliency, previews) Files: - .github/agents/spectre.agent.md: Agent definition - .github/prompts/spec-architecture-review-guidelines.md: Guidelines - .github/workflows/spectre.md: Workflow (label-triggered) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove hero scenario suggestion from Spectre workflow Split the README/hero-scenario suggestion (former Step 4) into a separate workflow to keep the core spec review focused. The hero scenario feature will ship in a follow-up PR. Renumbered Step 5 (Update Memory) → Step 4. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add Spectre Hero Scenarios workflow Separate workflow that suggests a service README with hero scenarios for API specification PRs. Split from the core Spectre review workflow to keep concerns separate. Analyzes the API surface changed in a PR and generates end-to-end hero scenarios that compose multiple API calls into meaningful developer workflows, including cross-service integrations. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Use dedicated hero-scenarios-needed label Separate from Spectre's spec-architecture-review-needed label so the two workflows can be triggered independently. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove Spectre branding, rename to hero-scenarios.md The hero scenarios workflow is now fully independent — no references to Spectre in the file name, description, or content. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add golden example to hero scenarios workflow Adds the DatabaseWatcher scenario as a complete, annotated golden example that the agent can pattern-match against. Explains what makes it good: one business outcome, multiple resource types composed into a workflow, cross-service references, ends with customer value. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove fixed scenario count, encourage cross-service API calls Scenarios should be driven by the API surface, not a hardcoded 3-5 range. Explicitly instructs the agent to include calls to other Azure service APIs when that reflects a real developer workflow. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Split hero scenarios into agent + prompt files - .github/agents/hero-scenarios.agent.md: trigger config, permissions, and short description that references the guidelines - .github/prompts/hero-scenarios-guidelines.md: full procedure with design principles, golden example, scenario format, and posting rules - Removed monolithic .github/workflows/hero-scenarios.md Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Improve hero-scenarios agent and remove spectre files - Remove spectre agent and workflow files - Fix permissions: pull-requests read → write, remove unused actions:read - Remove unnecessary bash tool access - Add response bodies to golden example HTTP blocks - Scope cross-service guidance to references in the changed spec only Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add hero-scenarios workflow and compile lock file - Add .github/workflows/hero-scenarios.md for gh-aw compilation - Use safe-outputs add-comment instead of pull-requests: write - Update agent file to match workflow permissions Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Align hero-scenarios with sdk-for-js workflow patterns - Add restricted bash allowlist for safe file reading - Add cache-memory and repo-memory for cross-run persistence - Recompile lock file Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove spec-architecture-review-guidelines.md Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix hero-scenarios guidelines review issues - Add response body to golden example Step 1 (LRO 201 Created) - Add multi-service PR guidance in Step 0 - Clarify example file filtering (ignore files under examples/ dirs) - Specify which directories to check for README in Step 1 - Reference add-comment safe-output in Step 4 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Separate agent definition from workflow definition Agent file is now a lightweight Copilot Chat agent (description, role, checklist, scope, output format) following the archie.agent.md pattern. Workflow file retains the full GitHub Actions config (triggers, permissions, safe-outputs, timeout). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Recompile with gh-aw v0.65.6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Use inline code suggestion when README already exists When a README with hero scenarios already exists, the agent now posts an inline review comment with a GitHub suggestion block on the README file so the author can apply it with one click. Top-level add-comment is still used when no README exists. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * style: format hero-scenarios workflow files with prettier Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * style: format hero-scenarios.md and exclude lock.yml from prettier - Format hero-scenarios.md (remove trailing blank line before ---) - Add **/*.lock.yml to .prettierignore — these are auto-generated by gh-aw compile and should not be reformatted by prettier Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * [.gitattributes] add trailing newline * Apply suggestion from @mikeharder * chore: upgrade gh-aw to v0.67.1 and consolidate actions-lock.json - Upgraded gh-aw-actions/setup from v0.65.4/v0.65.6 to v0.67.1 - Consolidated actions-lock.json to a single pinned version - Recompiled hero-scenarios.lock.yml with latest gh-aw Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: fix sdk-generation-agent import paths and recompile all workflows - Fix backslash paths to forward slashes in sdk-generation-agent.md imports - Recompile sdk-generation-agent.lock.yml with gh-aw v0.67.1 - All workflows now use the same compiler version Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore: switch hero-scenarios from pull_request_target to pull_request Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Deyaa Eldeen <deyaaeldeen@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Mike Harder <mharder@microsoft.com>
* use doc-warden from feed directly. no more pypi --------- Co-authored-by: Scott Beddall <scbedd@microsoft.com>
Co-authored-by: Francis Tran <ftran@microsoft.com>
* Run update release plan from GitHub agent workflow for SDK generation
* [Foundry] Consolidating service patterns + Adding LRO. * adding timestamp * yaml * use 200 for delete and cancel & remove OkResponse that conflicted with TypeSpec.Http.OkResponse * delete return nocontent
…date (#42187) Bumps the eslint group with 1 update in the /.github directory: [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint). Bumps the eslint group with 1 update in the /.github/shared directory: [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint). Updates `typescript-eslint` from 8.57.2 to 8.58.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.58.0/packages/typescript-eslint) Updates `typescript-eslint` from 8.57.2 to 8.58.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.58.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-version: 8.58.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: typescript-eslint dependency-version: 8.58.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…t VmFamilies (#42171) * Add Features_Disable LRO action in new stable api-version 2026-04-30 - Add new stable API version 2026-04-30 to Microsoft.ComputeLimit - Add Features_Disable async POST action (LRO with Location-based polling) mirroring the existing Features_Enable action from 2026-03-20 - 2026-03-20 remains unchanged - Add examples and update readme.md with new default tag * fix: format Features_Disable.json with prettier * fix: prettier issue in Features_Disable.json * Add VmFamily read-only proxy resource for api-version 2026-04-30 - Add VmFamily as a location-scoped proxy resource under SubscriptionLocationResource - Support GET and LIST operations only (read-only reference data) - Category property as plain string for VM family classification - Add examples for VmFamilies_Get and VmFamilies_List - Regenerate swagger for 2026-04-30 * add $filter query parameter to VM family list operation * Remove systemData from VmFamilies examples for consistency with other resources.
…_8.4 parse error (#42204) Agent-Logs-Url: https://github.com/Azure/azure-rest-api-specs/sessions/39f8338f-0f6b-4ecd-b4fe-d5489cb834cd Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
…igration (#42200) * Update tspconfig.yaml for servicebus Java SDK migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add Java clientName for NamespaceFailoverProperties Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* add workaround for device registry * Update client.tsp * Update client.tsp
…41617) * convert * convert1 * convert AccessReview * update * RoleAssignment compile * authorization compile * fix usertype * update * add common * add suppress * remove operationId * update * delete * delete agent * fix cspell * fix pipeline error * fix common type * fix model validation * compile * rename namespaces * fix armCommonTypesVersion * Revert "fix armCommonTypesVersion" This reverts commit 0243e28. * update client.tsp * regen * update * revert * fix modelvalidation * update readme * update * add x-ms-path * update x-ms-path * add suppress * rename folder * update * update suppress * update tspconfig * rename ClassicAdmin * update client name * Fix Authorization refreshAll LRO response shape * Use go alternateType for DenyAssignmentPrincipalType * fix finalresult * Update client.tsp * Update client.tsp * Update ProviderOperationsMetadata.tsp * Update client.tsp * Update client.tsp * java tspconfig * Update tspconfig and client.tsp for Java authorization migration - Add premium: true to preserve hand-written files - Add use-object-for-unknown: true for unknown type support - Add @@Usage for RoleAssignment as input model in Java Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * turn off samples * update * fix * fix * add x-ms-skip-url-encoding * update readme * add file * update --------- Co-authored-by: Jiao Di (MSFT) <v-jiaodi@microsoft.com> Co-authored-by: judy <v-liujudy@microsoft.com> Co-authored-by: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com> Co-authored-by: Weidong Xu <weidxu@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Pan Shao <97225342+pshao25@users.noreply.github.com>
added 2 commits
April 28, 2026 17:27
- Network.DdosCustomPolicy.tsp: Added TypeSpec.Versioning import/using (already on release branch) - Network.ExpressRouteGateway.tsp: Same - Network.LoadBalancer.tsp: Same - Network.NatGateway.tsp: Same - Vmss.back-compatible.tsp: Same - Vmss.main.tsp: Use Common.Versions.v2025_07_01 dependency - stable/2018-10-01/vmssNetwork.json: Kept new 2025-07-01 type definitions - stable/2025-05-01/common.json: Merged with main's non-conflicting improvements
santoshgh317
requested review from
a team,
Juliehzl,
MaryGao,
benbp,
live1206,
maririos,
mikeharder,
praveenkuttappan,
pshao25,
raosuhas,
raych1,
solankisamir and
weshaggard
as code owners
github-actions
Bot
added
BreakingChange-Go-Sdk-Suppression
BreakingChange-JavaScript-Sdk-Suppression
data-plane
new-api-version
RPaaS
SuppressionReviewRequired
brownfield
github-actions
Bot
added
BreakingChange-Python-Sdk
BreakingChange-JavaScript-Sdk
labels
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves merge conflicts between release-microsoft-network-2025-07-01 and main branch.
Only conflict resolutions - no additional commits merged:
This PR contains a single commit with only the necessary conflict resolutions.