Skip to content
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

Merged
merged 2 commits into from
Aug 28, 2024

Conversation

buyaa-n
Copy link
Member

@buyaa-n buyaa-n commented Aug 28, 2024

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

@buyaa-n buyaa-n requested a review from a team as a code owner August 28, 2024 20:48
Copy link
Member

@carlossanlop carlossanlop left a 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.

@carlossanlop
Copy link
Member

/backport to release/9.0.1xx

Copy link
Contributor

Started backporting to release/9.0.1xx: https://github.com/dotnet/roslyn-analyzers/actions/runs/10604318124

Copy link
Contributor

@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!

Copy link
Contributor

@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.

Copy link

codecov bot commented Aug 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.49%. Comparing base (e362b92) to head (aeb502e).
Report is 1 commits behind head on main.

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           

@buyaa-n buyaa-n merged commit 3170f2d into dotnet:main Aug 28, 2024
11 checks passed
@buyaa-n
Copy link
Member Author

buyaa-n commented Aug 28, 2024

/backport to release/9.0.1xx

Copy link
Contributor

Started backporting to release/9.0.1xx: https://github.com/dotnet/roslyn-analyzers/actions/runs/10604852112

Copy link
Contributor

@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!

Copy link
Contributor

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants