[release/10.0.1xx] Backport change validation pipeline#4409
Merged
premun merged 11 commits intodotnet:release/10.0.1xxfrom Feb 3, 2026
Merged
[release/10.0.1xx] Backport change validation pipeline#4409premun merged 11 commits intodotnet:release/10.0.1xxfrom
premun merged 11 commits intodotnet:release/10.0.1xxfrom
Conversation
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com>
ViktorHofer
approved these changes
Jan 26, 2026
ViktorHofer
reviewed
Feb 2, 2026
ViktorHofer
reviewed
Feb 2, 2026
premun
reviewed
Feb 2, 2026
ViktorHofer
approved these changes
Feb 2, 2026
premun
requested changes
Feb 3, 2026
Member
premun
left a comment
There was a problem hiding this comment.
Can't merge, we need to revert the test changes (version files etc)
Contributor
Author
I don't follow, what are the test changes, and why? |
dkurepa
approved these changes
Feb 3, 2026
premun
approved these changes
Feb 3, 2026
Member
|
/backport to release/10.0.2xx |
Contributor
|
Started backporting to |
Contributor
|
@premun backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add PR pipeline stage to validate VMR changes
.git/rebase-apply/patch:147: trailing whitespace.
)
.git/rebase-apply/patch:324: trailing whitespace.
.git/rebase-apply/patch:349: trailing whitespace.
.git/rebase-apply/patch:396: trailing whitespace.
string TargetBranch,
.git/rebase-apply/patch:436: trailing whitespace.
_dependencyTracker = vmrDependencyTracker;
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M eng/Version.Details.props
M eng/Version.Details.xml
M eng/Versions.props
M eng/pipelines/pr.yml
M src/source-mappings.json
Falling back to patching base and 3-way merge...
Auto-merging eng/Version.Details.props
CONFLICT (content): Merge conflict in eng/Version.Details.props
Auto-merging eng/Version.Details.xml
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/pipelines/pr.yml
CONFLICT (content): Merge conflict in eng/pipelines/pr.yml
Auto-merging src/source-mappings.json
CONFLICT (content): Merge conflict in src/source-mappings.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Add PR pipeline stage to validate VMR changes
Error: The process '/usr/bin/git' failed with exit code 128 |
adamzip
added a commit
to adamzip/dotnet
that referenced
this pull request
Feb 3, 2026
This was referenced Feb 4, 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
5 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.
Port the change validation pipeline, which was merged into main last year but not into the release bands
dotnet/arcade-services#5850