Update Xunit to 2.4.2 #74262
Merged
Update Xunit to 2.4.2 #74262
Conversation
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
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue Detailsnull
|
ViktorHofer
approved these changes
Aug 19, 2022
This was referenced Aug 19, 2022
|
This currently blocks the test stabilization exercise. I reran the failing legs and will merge this as soon as I'm confident that eventual remaining failures are unrelated. Also I will need to cherry-pick this commit into the 7.0.0-test branch. |
|
/backport to release/7.0-rc1 |
|
Started backporting to release/7.0-rc1: https://github.com/dotnet/runtime/actions/runs/2895365634 |
ViktorHofer
pushed a commit
that referenced
this pull request
Aug 20, 2022
|
@ViktorHofer backporting to release/7.0-rc1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Xunit to 2.4.2
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Xunit to 2.4.2
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
ViktorHofer
added a commit
that referenced
this pull request
Aug 20, 2022
2.4.2 stable released ~2 weeks ago and we have at least one shipping library that depends on it. For releasing 7.0.0, we must not depend on prerelease versions. Manual backport of #74262
Merged
carlossanlop
pushed a commit
that referenced
this pull request
Aug 21, 2022
2.4.2 stable released ~2 weeks ago and we have at least one shipping library that depends on it. For releasing 7.0.0, we must not depend on prerelease versions. Manual backport of #74262
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.