-
Notifications
You must be signed in to change notification settings - Fork 467
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
Update AnalyzerReleases file to reflect new analyzers for .NET9 release #7396
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM just have that question above.
/backport to release/9.0.1xx |
Started backporting to release/9.0.1xx: https://github.com/dotnet/roslyn-analyzers/actions/runs/10604318124 |
ee8776a
to
b021a92
Compare
@carlossanlop backporting to release/9.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update AnalyzerReleases file to reflect new analyzers for .NET9 release
Using index info to reconstruct a base tree...
M src/NetAnalyzers/Core/AnalyzerReleases.Unshipped.md
Falling back to patching base and 3-way merge...
Auto-merging src/NetAnalyzers/Core/AnalyzerReleases.Unshipped.md
CONFLICT (content): Merge conflict in src/NetAnalyzers/Core/AnalyzerReleases.Unshipped.md
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 Update AnalyzerReleases file to reflect new analyzers for .NET9 release
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@carlossanlop an error occurred while backporting to release/9.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7396 +/- ##
=======================================
Coverage 96.49% 96.49%
=======================================
Files 1443 1443
Lines 345964 345964
Branches 11385 11385
=======================================
+ Hits 333842 333843 +1
+ Misses 9240 9239 -1
Partials 2882 2882 |
/backport to release/9.0.1xx |
Started backporting to release/9.0.1xx: https://github.com/dotnet/roslyn-analyzers/actions/runs/10604852112 |
@buyaa-n backporting to release/9.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update AnalyzerReleases file to reflect new analyzers for .NET9 release
Using index info to reconstruct a base tree...
M src/NetAnalyzers/Core/AnalyzerReleases.Unshipped.md
Falling back to patching base and 3-way merge...
Auto-merging src/NetAnalyzers/Core/AnalyzerReleases.Unshipped.md
CONFLICT (content): Merge conflict in src/NetAnalyzers/Core/AnalyzerReleases.Unshipped.md
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 Update AnalyzerReleases file to reflect new analyzers for .NET9 release
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@buyaa-n an error occurred while backporting to release/9.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Update AnalyzerReleases file to reflect new analyzers for .NET9 release same as in #6940
This need to be ported to release/9.0.1xx branch.
The new analyzer added in 10.0 will be removed from that port
CC @carlossanlop @jeffhandley