Merge release/6.0.1xx to release/6.0.2xx

[dotnet-bot]

This is an automatically generated pull request from release/6.0.1xx into release/6.0.2xx.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

• https://github.com/dotnet/roslyn/find/release/6.0.1xx
• https://github.com/dotnet/roslyn/find/release/6.0.2xx

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout -t upstream/merges/release/6.0.1xx-to-release/6.0.2xx
git reset --hard upstream/release/6.0.2xx
git merge upstream/release/6.0.1xx
# Fix merge conflicts
git commit
git push upstream merges/release/6.0.1xx-to-release/6.0.2xx --force

[codecov]

Codecov Report

Merging #5932 (bab922f) into release/6.0.2xx (c750b5a) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@                 Coverage Diff                 @@
##           release/6.0.2xx    #5932      +/-   ##
===================================================
- Coverage            95.54%   95.54%   -0.01%     
===================================================
  Files                 1275     1275              
  Lines               292698   292697       -1     
  Branches             17701    17701              
===================================================
- Hits                279647   279646       -1     
- Misses               10647    10649       +2     
+ Partials              2404     2402       -2     

[mavasani]

Markdowntolint is failing with unrelated errors:

README.md:43:4 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:51:4 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:71:88 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:91:75 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:93:56 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:101:80 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:103:82 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]
README.md:121:188 MD049/emphasis-style Emphasis style should be consistent [Expected: asterisk; Actual: underscore]

@Youssef1313 do you know if Markdowntolint had breaking changes?

[Youssef1313]

@mavasani Yes, that was fixed before in 5c53926 (#5851), but looks like this didn't get into release/6.0.2xx. We should also pin the version we use instead of always pulling the latest version, but, sorry, I forgot to do that.

I opened #6053 for pinning the version.

[carlossanlop]

This never got merged. Do we still need it, @Evangelink ?