Skip to content

Conversation

@akhera99
Copy link
Member

No description provided.

@akhera99 akhera99 requested a review from a team as a code owner February 19, 2025 21:30
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Feb 19, 2025
@akhera99 akhera99 enabled auto-merge February 19, 2025 21:37
@akhera99 akhera99 merged commit df5f19a into dotnet:main Feb 19, 2025
25 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Feb 19, 2025
@akhera99
Copy link
Member Author

/backport to release/dev17.13

@github-actions
Copy link
Contributor

Started backporting to release/dev17.13: https://github.com/dotnet/roslyn/actions/runs/13445389102

@akhera99
Copy link
Member Author

/backport to release/dev17.14

@github-actions
Copy link
Contributor

Started backporting to release/dev17.14: https://github.com/dotnet/roslyn/actions/runs/13445415055

@akhera99
Copy link
Member Author

/backport to release/dev17.12

@github-actions
Copy link
Contributor

Started backporting to release/dev17.12: https://github.com/dotnet/roslyn/actions/runs/13445418149

@akhera99
Copy link
Member Author

/backport to release/dev17.10

@github-actions
Copy link
Contributor

Started backporting to release/dev17.10: https://github.com/dotnet/roslyn/actions/runs/13445436824

@akhera99
Copy link
Member Author

/backport to release/dev17.8

@github-actions
Copy link
Contributor

Started backporting to release/dev17.8: https://github.com/dotnet/roslyn/actions/runs/13445439348

@github-actions
Copy link
Contributor

@akhera99 backporting to "release/dev17.12" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: disable realtime monitoring
.git/rebase-apply/patch:15: trailing whitespace.
          
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	azure-pipelines-pr-validation.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr-validation.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr-validation.yml
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 disable realtime monitoring
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@akhera99 backporting to "release/dev17.10" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: disable realtime monitoring
.git/rebase-apply/patch:15: trailing whitespace.
          
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	azure-pipelines-pr-validation.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr-validation.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr-validation.yml
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 disable realtime monitoring
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@akhera99 backporting to "release/dev17.8" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: disable realtime monitoring
.git/rebase-apply/patch:15: trailing whitespace.
          
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	azure-pipelines-pr-validation.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr-validation.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr-validation.yml
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 disable realtime monitoring
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

akhera99 added a commit that referenced this pull request Feb 20, 2025
…ipeline (#77300)

Backport of #77282 to release/dev17.13

/cc @akhera99

## Customer Impact

## Regression

- [ ] Yes
- [ ] No

[If yes, specify when the regression was introduced. Provide the PR or
commit if known.]

## Testing

[How was the fix verified? How was the issue missed previously? What
tests were added?]

## Risk

[High/Medium/Low. Justify the indication by mentioning how risks were
measured and addressed.]
@akhera99 akhera99 modified the milestones: Next, 17.14 P2 Feb 25, 2025
akhera99 added a commit that referenced this pull request Feb 27, 2025
…ipeline (#77301)

Backport of #77282 to release/dev17.14

/cc @akhera99

## Customer Impact

## Regression

- [ ] Yes
- [ ] No

[If yes, specify when the regression was introduced. Provide the PR or
commit if known.]

## Testing

[How was the fix verified? How was the issue missed previously? What
tests were added?]

## Risk

[High/Medium/Low. Justify the indication by mentioning how risks were
measured and addressed.]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants