Repository navigation
Merge main into release-network-2026-01-01 (round 2, unblock PR #30195) - #30208
Merged
Ethan Yang (necusjz) merged 8 commits intoSep 28, 2026
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…#30195) Resolves conflict in src/Network/Network/ChangeLog.md by keeping both the release-branch entries (2026-01-01 API cycle) and the new main-branch entry (Removed client-side validation of the -FormatVersion parameter for New-AzNetworkWatcherFlowLog / Set-AzNetworkWatcherFlowLog). Also reverts src/Network/NetworkSecurityPerimeter.Autorest/Properties/AssemblyInfo.cs to the main-branch version (restores the trailing newline that was inadvertently dropped by the NSP.Autorest regen in PR Azure#30146). The file text is otherwise identical; this addresses the review comment on PR Azure#30195 that release automation should be the sole owner of AssemblyInfo.cs.
Contributor
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
3 tasks done
Member
|
/azp run |
Contributor
|
Azure Pipelines: Successfully started running 3 pipeline(s). |
Ethan Yang (necusjz)
approved these changes
Sep 28, 2026
Ethan Yang (necusjz)
merged commit Sep 28, 2026
3b0d103
into
Azure:release-network-2026-01-01
12 checks passed
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
4 participants
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.
Description
Round-2 sync of
mainintorelease-network-2026-01-01to unblock the release rollup PR #30195 (mergeStateStatus: DIRTY,mergeable: CONFLICTING).Also folds in the fix requested by the Copilot review comment on #30195: reverting
src/Network/NetworkSecurityPerimeter.Autorest/Properties/AssemblyInfo.csto themainversion so release automation remains the sole owner of that file.Follows the same pattern as the previously merged round-1 sync PR #30196.
Why this is needed
release-network-2026-01-01and fixed the last blocking check on [Do Not Squash] Release network 2026 01 01 #30195.mainhas advanced further and a new commit touchingsrc/Network/Network/ChangeLog.mdintroduced a text-level conflict with the release branch.mainagain.Changes
1. Merge conflict —
src/Network/Network/ChangeLog.mdKept both sets of
## Upcoming Releaseentries:VerifyClientAuthMode,2026-01-01SDK upgrade, IPv6 peering fix, IPAM min/max allocation size, ExpressRoute/Port authorization key retrieval, WAF managed-rule paranoia level & display name, Firewall PolicySourceGeoLocation/DestinationGeoLocation.Removed client-side validation of the -FormatVersion parameter for New-AzNetworkWatcherFlowLog and Set-AzNetworkWatcherFlowLog(with the accompanying-FormatTypeerror-message fix).The entry from
mainis placed immediately after the release-branch block and before the pre-existingChange Safety/CAPTCHAentries that were common to both sides.2. Auto-merged from
main(no manual edits).github/workflows/codeql.ymlsrc/Network/Network.Test/ScenarioTests/NetworkWatcherAPITests.ps1src/Network/Network.Test/UnitTests/FlowLogValidationTests.cs(new)src/Network/Network/NetworkWatcher/FlowLog/FlowLogBaseCmdlet.cs3.
src/Network/NetworkSecurityPerimeter.Autorest/Properties/AssemblyInfo.cs— revert tomainCopilot review flagged this file on #30195 with a High severity comment:
AssemblyInfo.csunder a*.Autorestfolder is release-automation-owned, and the static analyzer (tools/StaticAnalysis/FileChangeAnalyzer/Test-FileChange.ps1lines 62–68) explicitly warns on manual edits.The actual diff on the release branch was purely a trailing-newline drop introduced by the NSP.Autorest regen bundled with PR #30146 — the text is byte-identical apart from the final
\n. This PR restores the trailing newline to matchmainexactly, closing out the review comment without any semantic change.Verified locally:
Testing / verification
git diff --check— no conflict markers remain.git show --stat HEAD— merge commit touches 6 files (5 auto-merged +ChangeLog.mdconflict resolution +AssemblyInfo.csrevert).Select-StringonChangeLog.md— both the cross-connection migration entry (release) and the-FormatVersionentry (main) are present.AssemblyInfo.cs(length 1498, last byte0x0A).Follow-up
Once this merges into
release-network-2026-01-01, PR #30195 becomesMERGEABLEagain and the standard CI (Build / Analyze / Test x3 / security-tools / windows-powershell) re-runs. All those legs were green on the prior head, so the rollup should be ready to merge tomainimmediately after.Checklist
AssemblyInfo.csmatchesmainbyte-for-byte.AssemblyInfo.csrevert.