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

Merge main to main-vs-deps #58066

Merged
merged 54 commits into from
Dec 6, 2021
Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from main into main-vs-deps.

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:

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/main-to-main-vs-deps
git reset --hard upstream/main-vs-deps
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-main-vs-deps --force

Youssef1313 and others added 30 commits October 2, 2020 18:33
Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
Addresses second item in #56843

Prior to this change, all the analyzers that are not high-pri are added to the normal priority bucket and executed at once. This PR further breaks down the normal priority bucket into two buckets as follow:

1. `Normal`: Analyzers that produce at least one fixable diagnostic, i.e. have a corresponding code fixer.
2. `Low`: Analyzers without any fixable diagnostics, i.e. have no corresponding code fixer. These diagnostics will only have Suppression/Configuration quick actions, which are lower priority and always show up at the bottom of the light bulb.

This new bucketing allows us to reduce the number of analyzers that are executed in the Normal priority bucket and hence generate all the non-suppression/configuration code fixes faster in async light bulb.
ryzngard and others added 5 commits December 1, 2021 12:20
No functional changes, just moving to the new API and cleaning up unused code
Pass AnalysisKind instead of int
Exclude unnecessary sqlite assemblies for .Net 6 host
@dotnet-bot dotnet-bot requested review from a team as code owners December 2, 2021 00:02
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Dec 2, 2021
@dotnet-bot
Copy link
Collaborator Author

⚠ This PR has merge conflicts. @allisonchou

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@dotnet-bot dotnet-bot enabled auto-merge December 2, 2021 00:02
Fix await completion for expression body lambda
@allisonchou allisonchou removed the Merge Conflicts There are merge conflicts with the base branch. label Dec 2, 2021
sharwell and others added 3 commits December 2, 2021 11:12
Skip flaky CommandLine.ArgumentParsing test

See #58077 for more details
@allisonchou allisonchou force-pushed the merges/main-to-main-vs-deps branch from 2566d59 to ed33286 Compare December 4, 2021 00:16
@JoeRobich JoeRobich disabled auto-merge December 6, 2021 19:07
@JoeRobich
Copy link
Member

Merging to unblock CI

@JoeRobich JoeRobich merged commit 3e5ced3 into main-vs-deps Dec 6, 2021
@ghost ghost added this to the Next milestone Dec 6, 2021
@Cosifne Cosifne modified the milestones: Next, 17.1.P3 Jan 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.