eng, bug fix in Compare-CurrentToCodegeneration.ps1 script#49328
Merged
weidongxu-microsoft merged 4 commits intoJun 2, 2026
Merged
Conversation
Member
Author
|
resolve conflict for #49287 |
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request updates Key Vault package versions across the repo (including version metadata and changelogs) and adjusts the Compare-CurrentToCodegeneration.ps1 script to normalize/deduplicate/sort ServiceDirectories so top-level service entries are processed before specific libraries (avoiding duplicate work when both are provided).
Changes:
- Bump Key Vault Secrets and Certificates package versions (including new “Unreleased” changelog entries) and update
eng/versioning/version_client.txt. - Update various repo consumers (Spring starters/autoconfigure, tooling, samples, e2e) to reference the latest released Key Vault versions (and update internal “current” references where appropriate).
- Fix
Compare-CurrentToCodegeneration.ps1service directory handling by normalizing, deduplicating, ordering, and skipping redundant library paths when the top-level service is already included.
Reviewed changes
Copilot reviewed 21 out of 21 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| sdk/tools/azure-openrewrite/pom.xml | Updates Key Vault test/provided dependency versions to the latest released versions. |
| sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml | Bumps Key Vault Secrets dependency to 4.11.0. |
| sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml | Bumps Key Vault Certificates dependency to 4.9.0. |
| sdk/spring/spring-cloud-azure-service/pom.xml | Updates optional Key Vault dependency versions (certificates/secrets). |
| sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | Updates optional Key Vault dependency versions (certificates/secrets). |
| sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml | Bumps Key Vault Secrets dependency to 4.11.0. |
| sdk/spring/spring-cloud-azure-actuator/pom.xml | Updates optional Key Vault dependency versions (certificates/secrets). |
| sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml | Updates optional Key Vault dependency versions (certificates/secrets). |
| sdk/resourcemanager/azure-resourcemanager-samples/pom.xml | Updates Key Vault Certificates dependency to 4.9.0. |
| sdk/network/azure-resourcemanager-network/pom.xml | Updates Key Vault Certificates test dependency to 4.9.0. |
| sdk/keyvault/azure-security-keyvault-secrets/pom.xml | Increments Key Vault Secrets package version to 4.12.0-beta.1. |
| sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md | Adds an “Unreleased” section for 4.12.0-beta.1. |
| sdk/keyvault/azure-security-keyvault-perf/pom.xml | Updates “current” Key Vault dependency versions to the new beta versions. |
| sdk/keyvault/azure-security-keyvault-certificates/pom.xml | Increments Key Vault Certificates package version to 4.10.0-beta.1. |
| sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md | Adds an “Unreleased” section for 4.10.0-beta.1. |
| sdk/keyvault/azure-resourcemanager-keyvault/pom.xml | Updates Key Vault Secrets dependency to 4.11.0. |
| sdk/e2e/pom.xml | Updates Key Vault “current” versions used by e2e module to the new beta versions. |
| sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml | Updates Key Vault Secrets test dependency to 4.11.0. |
| sdk/appplatform/azure-resourcemanager-appplatform/pom.xml | Updates Key Vault Certificates test dependency to 4.9.0. |
| eng/versioning/version_client.txt | Advances current/next versions for Key Vault certificates and secrets. |
| eng/scripts/Compare-CurrentToCodegeneration.ps1 | Normalizes/deduplicates/sorts ServiceDirectories and skips redundant library entries when top-level service is present. |
XiaofeiCao
approved these changes
Jun 1, 2026
alzimmermsft
approved these changes
Jun 1, 2026
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.
#49287 + fix a bug in Compare-CurrentToCodegeneration.ps1 script
bug is that there is possibility that a module be contained in 2 ServiceDirectories, e.g.
keyvault,keyvault/azure-resourcemanager-keyvault-- hereazure-resourcemanager-keyvaultmodule would be processed twice, in parallel processes, likely causing race condition on file system, as 2 processes runs in the same foldercommit c531267
ref #49287 (comment)
now result is good
https://dev.azure.com/azure-sdk/public/_build/results?buildId=6376549&view=logs&j=b70e5e73-bbb6-5567-0939-8415943fadb9&t=8dd92614-7454-569d-3061-0c20dc3c788d
Description
Please add an informative description that covers that changes made by the pull request and link all relevant issues.
If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
All SDK Contribution checklist:
General Guidelines and Best Practices
Testing Guidelines