-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Add -ResetToTargetPaths parameter to github-merge-flow.jsonc #52000
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Co-authored-by: marcpopMSFT <[email protected]>
|
@copilot can you add global.json to all lists. Add Versions.Details.props to 10.0.1xx, 10.0.2xx and main branches. Remove Versions.props for those same three branches as the automated ones moved into the Versions.Details.props |
|
@MiYanni this is what I was referring to earlier. The arcade change is in so we can add this. No idea how to test it outside of merging it though. |
…ranches Co-authored-by: marcpopMSFT <[email protected]>
Done in commit 231d624. Changes made:
|
marcpopMSFT
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Confirmed the capitalization matches what's in the repo. Also confirmed the transition from 9.0.3xx to 10.0.1xx switches from Versions.props to Version.details.props as expected. This looks right but no clue how to test besides merging and doing runs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR configures automated merge flows to prevent version metadata and infrastructure files from propagating across release boundaries. The -ResetToTargetPaths parameter is added to all 8 merge flow configurations, ensuring that each branch maintains its own version identity and infrastructure state during automated merges.
- Added
-ResetToTargetPathsparameter to all merge flow configurations with appropriate file paths - Configured branch-specific version files: older branches (8.0.x-9.0.1xx) use
eng/Versions.props, while newer branches (10.0.1xx+) useeng/Version.Details.props - Applied consistent file exclusion list across all flows:
global.json,NuGet.config,eng/Version.Details.xml, version props files, andeng/common/*
Configure automated merge flows to reset specific files to target branch versions instead of merging them forward. This prevents version metadata and infrastructure files from propagating across release boundaries.
Changes
-ResetToTargetPathsparameter to all 8 merge flow configurationsglobal.json- SDK version configurationNuGet.config- package source configurationeng/Version.Details.xml- dependency version trackingeng/Versions.props- version properties (for 8.0.x and 9.0.1xx branches)eng/Version.Details.props- consolidated version properties (for 10.0.1xx, 10.0.2xx, and main branches)eng/common/*- arcade infrastructure scriptsBranch-Specific Configuration
Branches 8.0.x through 9.0.1xx use
eng/Versions.props:Branches 10.0.1xx, 10.0.2xx, and main use
eng/Version.Details.props:Implements functionality from dotnet/arcade#16369.
Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.