{Branch Management} Fix merge-base: Merge release 2.90.0 fixes back to dev

[mansoor sarfraz (msarfraz)]

🤖 PR Validation — ️✔️ All clear

Breaking Changes	Tests
️✔️ None	️✔️ 130/130

Fix merge-base between release and dev

After the 2.90.0 fixes applied on release (PR #33987), the hotfix commits need to come back to dev so the two branches stay in sync and future scans/CI on dev do not drift.

Commits being merged back

#	Commit	PR	Description
1	2e67654b4b	#33987	{Packaging} Update Expat to be compatible with current Python

State before this PR

upstream/release HEAD	dc50d47
upstream/dev HEAD	ef9e71d
Commits in release not in dev	1
Files changed	1

What this PR does

This PR satisfies the azure-production-ruleset pull-request requirement and uses a GitHub merge commit to link release history into dev. Squash or rebase must not be used because they do not preserve release as an ancestor of dev.

Repository configuration required

1. In Settings > General > Pull Requests, enable Allow merge commits.
2. In Settings > Rules > Rulesets > Copilot review, add the repository role that will perform the merge to the bypass list with Always allow:
   • Add Repository admins for admin merges.
   • Add Repository maintainers too if maintainers must perform this operation.

The bypass is required because the Copilot review ruleset otherwise permits only squash merges for dev.

How to merge future release backports

1. Open a PR from release to dev.
2. Obtain approval and wait for all required checks to pass.
3. Select Create a merge commit. Do not select squash or rebase.
4. Select Merge without waiting for requirements to be met (bypass rules).
5. Merge the PR.

CLI equivalent for a repository admin:

gh pr merge <PR_NUMBER> --repo Azure/azure-cli --merge --admin

Do not merge locally and push directly to dev; branch protection and the organization ruleset require the change to be merged through the PR.

Result

PR #33987 was merged as 9a2c8e0bee95f1a954bc397b4f229d1db8ae128f:

• ef9e71dface1f409c05dcfcbf5047b5e8600832e (dev before the merge)
• dc50d475a00ded4a1a1980d4a10a9fbd9a750a81 (release)

The dev/release merge-base is now dc50d475a00ded4a1a1980d4a10a9fbd9a750a81.

Reference

Related historical processes: PR #33987 .

[Yong Zhang (yonzhan)]

Thank you for your contribution! We will review the pull request and get back to you soon.

[Copilot]

Pull request overview

This pull request merges the 2.90.0 release hotfix back into dev to restore a correct merge-base between release and dev, preventing branch drift and keeping CI/scans aligned.

Changes:

• Update the RPM-in-Docker test script to dnf update -y expat before installing the built RPM to avoid Python 3.12 pyexpat incompatibilities on pinned UBI 8/9 images.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[Copilot]

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.