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 .NET8 release #6940

Merged
merged 1 commit into from
Sep 15, 2023

Conversation

mavasani
Copy link
Contributor

Note that this PR is essential to ensure setting AnalysisLevel to 8 enables the new analyzers added with .NET8.

Note that this PR is essential to ensure setting AnalysisLevel to 8 enables the new analyzers added with .NET8.
@mavasani mavasani requested a review from a team as a code owner September 14, 2023 06:29
@mavasani
Copy link
Contributor Author

@carlossanlop This is another PR that would need to be backported to release 8.0.1.xx branch.

@codecov
Copy link

codecov bot commented Sep 14, 2023

Codecov Report

Merging #6940 (77351a2) into main (d29b797) will increase coverage by 0.00%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #6940   +/-   ##
=======================================
  Coverage   96.40%   96.40%           
=======================================
  Files        1402     1402           
  Lines      331927   331932    +5     
  Branches    11031    11032    +1     
=======================================
+ Hits       319979   319991   +12     
+ Misses       9186     9178    -8     
- Partials     2762     2763    +1     

@mavasani mavasani merged commit b0e8ed7 into dotnet:main Sep 15, 2023
14 checks passed
@mavasani
Copy link
Contributor Author

/backport to release/8.0.1xx

@github-actions
Copy link
Contributor

Started backporting to release/8.0.1xx: https:/dotnet/roslyn-analyzers/actions/runs/6193037384

@github-actions
Copy link
Contributor

@mavasani backporting to release/8.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 .NET8 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
Patch failed at 0001 Update AnalyzerReleases file to reflect new analyzers for .NET8 release
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 128

Please backport manually!

@github-actions
Copy link
Contributor

@mavasani an error occurred while backporting to release/8.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.

3 participants