Enable VersionDetailsProps merge policy in forward flow PRs#5217
Merged
dkurepa merged 8 commits intodotnet:mainfrom Aug 28, 2025
Merged
Enable VersionDetailsProps merge policy in forward flow PRs#5217dkurepa merged 8 commits intodotnet:mainfrom
dkurepa merged 8 commits intodotnet:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR enables the VersionDetailsProps merge policy for forward flow PRs by implementing path resolution logic to locate version files within the Virtual Mono Repository (VMR) structure. Previously, this policy was disabled for forward flow PRs due to missing implementation.
- Adds logic to determine correct file paths for forward flow PRs by reading the source manifest
- Removes the early return that disabled the policy for forward flow PRs
- Updates error messages to use dynamic paths instead of hardcoded file names
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| test/ProductConstructionService.ScenarioTests/ScenarioTests/ScenarioTests_CodeFlow.cs | Removes unused FluentAssertions import |
| src/Maestro/Maestro.MergePolicies/VersionDetailsPropsMergePolicy.cs | Implements VMR path resolution for forward flow PRs and updates file path handling |
| src/Maestro/Maestro.MergePolicies/StandardMergePolicy.cs | Removes conditional check that excluded VersionDetailsProps policy from forward flow PRs |
src/Maestro/Maestro.MergePolicies/VersionDetailsPropsMergePolicy.cs
Outdated
Show resolved
Hide resolved
src/Maestro/Maestro.MergePolicies/VersionDetailsPropsMergePolicy.cs
Outdated
Show resolved
Hide resolved
…cy.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…cy.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…nto dkurepa/VdpPolicyForwardFlows
premun
approved these changes
Aug 28, 2025
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.
Now that we're 100% sure all VMR repos have the VDP file, we can enable it on forward flow PRs too
#4865