July 2026 Patches Merge-back#49754
Merged
Merged
Conversation
Merge-back from release/patch/20260701 into main. Bumps dependency-version for the 2026-07-01 patched libraries in version_client.txt (keeping main's current-version, and never downgrading libraries main has already released past the patch, e.g. azure-resourcemanager-network and azure-resourcemanager-storage), inserts the 2026-07-01 patch CHANGELOG entries below each library's top/Unreleased section (version-ordered), and regenerates downstream pom.xml files via update_versions.py --skip-readme (READMEs intentionally unchanged). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jairmyree
requested review from
a team,
ArthurMa1978,
EldertGrootenboer,
XiaofeiCao,
alzimmermsft,
axisc,
benbp,
browndav-msft,
chenkennt,
gunjansingh-msft,
haolingdong-msft,
hmlam,
ibrandes,
kyleknap,
mikeharder,
raych1,
seanmcc-msft,
skarri-microsoft,
vcolin7,
vicancy,
weidongxu-microsoft and
zackliu
as code owners
July 8, 2026 18:32
jairmyree
requested review from
a team,
AikoBB,
kagbakpem,
maximrytych-ms and
mjafferi-msft
as code owners
July 8, 2026 18:32
Contributor
There was a problem hiding this comment.
Pull request overview
This PR re-creates the July 2026 patch-release merge-back from release/patch/20260701 into main, bringing back patch dependency-version bumps, dated 2026-07-01 CHANGELOG entries, and regenerated downstream pom.xml updates. It also carries two pipeline template updates from the patch branch and adds a new repository skill documenting the merge-back workflow.
Changes:
- Updated
eng/versioning/version_client.txtto bump patched libraries’ dependency-version while preservingmain’s current-version. - Inserted
## X.Y.Z (2026-07-01)patch entries into many packageCHANGELOG.mdfiles and regenerated manypom.xmlfiles viaupdate_versions.py --skip-readme. - Updated patch-release pipeline templates and added
.github/skills/azsdk-common-patch-mergeback/documentation for the merge-back process.
Reviewed changes
Copilot reviewed 203 out of 203 changed files in this pull request and generated 19 comments.
Show a summary per file
| File | Description |
|---|---|
| eng/versioning/version_client.txt | Patch merge-back dependency-version updates while preserving main current-versions. |
| eng/pipelines/templates/stages/archetype-sdk-client-patch.yml | Adds PipAuthenticate and pins Python package versions used during patch pipeline execution. |
| eng/pipelines/templates/stages/archetype-java-release-patch.yml | Adds Maven authentication/mirror setup step to patch release pipeline. |
| .github/skills/azsdk-common-patch-mergeback/SKILL.md | Documents the intended patch merge-back workflow and guardrails. |
| .github/skills/azsdk-common-patch-mergeback/references/version-client-resolution.md | Documents the version_client.txt reconciliation algorithm for merge-backs. |
| .github/skills/azsdk-common-patch-mergeback/references/changelog-resolution.md | Documents CHANGELOG reconciliation/merge-back rules for patch entries. |
| sdk/appservice/azure-resourcemanager-appservice/CHANGELOG.md | Adds 2026-07-01 patch entry; dependency “from” versions need correction to match prior release entry. |
| sdk/containerinstance/azure-resourcemanager-containerinstance/CHANGELOG.md | Adds 2026-07-01 patch entry; multiple dependency “from” versions need correction to match prior release entry. |
| sdk/keyvault/azure-resourcemanager-keyvault/CHANGELOG.md | Adds 2026-07-01 patch entry; dependency “from” versions need correction to match prior release entry. |
| sdk/msi/azure-resourcemanager-msi/CHANGELOG.md | Adds 2026-07-01 patch entry; dependency “from” versions need correction to match prior release entry. |
| sdk/sql/azure-resourcemanager-sql/CHANGELOG.md | Adds 2026-07-01 patch entry; dependency “from” versions need correction to match prior release entry. |
| sdk/eventhubs/azure-resourcemanager-eventhubs/CHANGELOG.md | Adds 2026-07-01 patch entry; dependency “from” versions need correction to match prior release entry. |
| sdk/trafficmanager/azure-resourcemanager-trafficmanager/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/servicebus/azure-resourcemanager-servicebus/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/authorization/azure-resourcemanager-authorization/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/search/azure-resourcemanager-search/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/redis/azure-resourcemanager-redis/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/privatedns/azure-resourcemanager-privatedns/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/monitor/azure-resourcemanager-monitor/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/cdn/azure-resourcemanager-cdn/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/dns/azure-resourcemanager-dns/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/network/azure-resourcemanager-network/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/cosmos/azure-resourcemanager-cosmos/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
| sdk/containerregistry/azure-resourcemanager-containerregistry/CHANGELOG.md | Adds 2026-07-01 patch entry; resources dependency “from” version needs correction. |
Brings back the second July 2026 patch batch (release/patch/20260707, patch prep #49743) and the azure-resourcemanager 2.63.0 GA release (#49738 / increment #49753) into main. - version_client.txt: bumped dependency-version for the 20260707 patched libraries (azure-resourcemanager-network 2.59.1, -storage 2.57.1, -compute 2.58.2, -sql 2.53.10, -appservice 2.55.4, -eventhubs 2.53.10, -containerinstance 2.53.12), keeping main's current-version; and set azure-resourcemanager to 2.63.0;2.64.0-beta.1 (GA + increment). - CHANGELOG.md: inserted the 2026-07-07 patch entries (version-ordered) for the 7 libraries and the azure-resourcemanager 2.63.0 GA entry (with 2.64.0-beta.1 Unreleased section). - pom.xml: regenerated via update_versions.py --skip-readme (READMEs unchanged). Deliberately excludes the source-code resets in the patch-prep commit; only version, CHANGELOG, and pom updates are brought back. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
vcolin7
reviewed
Jul 8, 2026
…l reference Co-authored-by: jairmyree <67484440+jairmyree@users.noreply.github.com>
Co-authored-by: jairmyree <67484440+jairmyree@users.noreply.github.com>
…ersions Co-authored-by: jairmyree <67484440+jairmyree@users.noreply.github.com>
Co-authored-by: vcolin7 <vicolina@microsoft.com>
…//github.com/Azure/azure-sdk-for-java into copilot/merge-back-release-patch-20260701-v2
Member
|
Wondering whether we should merge the version/pom first (if skill is still in discussion)? There are a few open PR that generating new version of SDK that going to cause conflict if merged. Currently I am holding them back. |
Co-authored-by: vcolin7 <vicolina@microsoft.com>
…rding beta-release entries
…//github.com/Azure/azure-sdk-for-java into copilot/merge-back-release-patch-20260701-v2
alzimmermsft
approved these changes
Jul 15, 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.
Re-creates the July 2026 patch-release merge-back that was intended by #49731. The original PR became corrupted (a stale merge-base dragged ~146K lines of unrelated code reverts into the diff) and was closed. This branch is built cleanly on top of the current
mainand contains only the intended changes.Contents
1. First patch batch — merge-back from
release/patch/20260701(dated2026-07-01)version_client.txt: bumpeddependency-versionfor the 2026-07-01 patched libraries, keepingmain'scurrent-version. Librariesmainhad already released past the patch were left atmain's newer values (not downgraded).## X.Y.Z (2026-07-01)entry in the correct version-ordered position (pure insertions, 0 content lines removed).update_versions.py --skip-readme.2. Second patch batch — merge-back from
release/patch/20260707(dated2026-07-07)main's current-version kept):azure-resourcemanager-network2.59.1,-storage2.57.1,-compute2.58.2,-sql2.53.10,-appservice2.55.4,-eventhubs2.53.10,-containerinstance2.53.12.2.63.0;2.64.0-beta.1, with the## 2.63.0 (2026-07-07)CHANGELOG entry and2.64.0-beta.1Unreleased section.## X.Y.Z (2026-07-07)entries inserted version-ordered.update_versions.py --skip-readme.3. New merge-back MCP skill
.github/skills/azsdk-common-patch-mergeback/(SKILL.md + reference docs) describing how patch-release merge-back PRs should be created.4. Two pipeline commits carried back from the release branch
efe7805— Add Pip Authenticate task and pin package versions inarchetype-sdk-client-patch.yml.d3229eb— Add Maven authentication step inarchetype-java-release-patch.yml.Verification
eng/versioning/pom_file_version_scanner.ps1passes (exit 0).README.mdfiles unchanged (--skip-readme).Supersedes #49731.