Skip to content

Merge master to features/static-lambdas#45237

Merged
39 commits merged intofeatures/static-lambdasfrom
merges/master-to-features/static-lambdas
Jun 17, 2020
Merged

Merge master to features/static-lambdas#45237
39 commits merged intofeatures/static-lambdasfrom
merges/master-to-features/static-lambdas

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/static-lambdas.

git fetch --all
git checkout merges/master-to-features/static-lambdas
git reset --hard upstream/features/static-lambdas
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-features/static-lambdas --force

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

allisonchou and others added 30 commits June 5, 2020 11:48
The motivation for this change is captured in code comments.
Don't default classifications if colors have been customized
Fix MakeMethodAsynchronous on ValueTask without generics.
Add ProjectGuid and SolutionSessionId to API telemetry
dotnet-maestro bot and others added 8 commits June 15, 2020 06:20
…614.5 (#45181)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-2.20267.1 -> To Version 3.7.0-4.20314.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This is just to prevent tests from not doing what we expected them to
do for the reason we thought.
Since we didn't have a moniker for built-in operators, we were confusing
LSIF importing tools that weren't sure what to do here. They would
make up a moniker based on the first use, but that's not stable across
different runs.

We _could_ make up a moniker here, but it's not clear if finding
references for all uses of + in a project is really terribly useful.
Only send relevant completion resolve parameters
…nces-for-built-in-operators

Don't generate references for built-in operators
@dotnet-bot dotnet-bot requested review from a team as code owners June 16, 2020 21:03
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Jun 16, 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

@ghost ghost merged commit 4c9f431 into features/static-lambdas Jun 17, 2020
@ghost ghost deleted the merges/master-to-features/static-lambdas branch June 17, 2020 16:01
This pull request was closed.
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.