Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

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

git fetch --all
git checkout merges/master-to-master-vs-deps
git reset --hard upstream/master-vs-deps
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-master-vs-deps --force

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

sharwell and others added 24 commits May 20, 2020 21:21
…rojects

```ini
[src/{Analyzers,CodeStyle,Features,Workspaces}/**/*.{cs,vb}]

# Prefer "var" everywhere
dotnet_diagnostic.IDE0007.severity = warning
csharp_style_var_for_built_in_types = true:warning
csharp_style_var_when_type_is_apparent = true:warning
csharp_style_var_elsewhere = true:warning
```
…06: No best type was found for the switch expression
[Dogfooding] Enforce IDE0007 (prefer "var") as build warning in IDE projects
Wait for rename operations to complete before assertion
Initialize integration tests without showing console windows
Fix the filter text for cref completion items
Simplify the helpers we use in symbol finding
Increase timeouts to account for slower build machines
@dotnet-bot dotnet-bot requested review from a team as code owners May 23, 2020 00:03
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels May 23, 2020
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

@JoeRobich JoeRobich merged commit 475bfb1 into master-vs-deps May 23, 2020
@ghost ghost added this to the Next milestone May 23, 2020
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 23, 2020 06:03
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 23, 2020 09:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 23, 2020 09:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 23, 2020 12:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 23, 2020 12:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 23, 2020 15:03
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 23, 2020 15:03
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 23, 2020 18:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 23, 2020 18:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch May 23, 2020 21:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch May 23, 2020 21:02
@RikkiGibson RikkiGibson modified the milestones: Next, 16.7.P3 Jun 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants