-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Switch to spliting our test work items by method instead of class. #44898
Open
marcpopMSFT
wants to merge
14
commits into
release/9.0.1xx
Choose a base branch
from
marcpopMSFT-splitbymethod
base: release/9.0.1xx
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
…et test for both full framework and not
…h the dotnet test format
… the environment block so we can see what else we can potentially use.
…t's see if this works.
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
Request triage from a team member
labels
Nov 15, 2024
/azp run dotnet-sdk-public-ci |
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
/backport to release/9.0.2xx |
Started backporting to release/9.0.2xx: https://github.com/dotnet/sdk/actions/runs/12383167775 |
@marcpopMSFT backporting to release/9.0.2xx failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Enable test timeout dump collection
Using index info to reconstruct a base tree...
M test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
Falling back to patching base and 3-way merge...
Auto-merging test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
CONFLICT (content): Merge conflict in test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
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 advice.mergeConflict false"
Patch failed at 0001 Enable test timeout dump collection
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
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.
Let's see if this works.