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 master to features/readonly-members #33445

Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/readonly-members.

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

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

gafter and others added 30 commits January 24, 2019 13:36
Fixes #32370

Fix parsing error recovery for incomplete switch expression
Fixes #32749
Two classes were deriving and using only the [UseExportProvider]
attribute; the third (CommandLineProjectWorkspaceTests) was only using
it to assert that DocumentInfos created by parsing command lines will
read file contents if asked. The last can be fixed up in a more direct
way.
Nothing other than one suspicious test in SolutionTests.cs used any
of this, so it's easier to move it all and keep things isolated.
The workspace isn't supposed to allow duplicate ProjectReferences, but
currently due to #12101 it does.
This dedups (correctly) at the surface and also adds a test to ensure
this isn't broken.

Fixes #31390.
Broken test reported at #33356
We had some code in the VS layer that was trying to work around the
fact that we might be MEF created on a background thread, when were
didn't know what the UI thread was. It tried to assert that the first
actual workspace mutation would happen on the UI thread, and so it was
safe to create the queue at that point. This is silly now for two
reasons:

1. We're using the IThreadingContext which knows what the main thread
   is directly and without any ceremony
2. We now do indeed do workspace mutations on other threads. It's still
   the case that the first mutation is on the UI thread today but that's
   a limitation we are actively wanting to excise.
… a case expression or a constant pattern.

Fixes #33054
Fixes #33208
- Incidentally also correct and test the precedence of the switch expression
See https://github.com/dotnet/csharplang/blob/master/proposals/patterns.md#switch-expression for the spec.
- Fix terminology to match the spec - "conditional expression" rather than "ternary expression".
Fix compiler crash and remove spurious hidden sequence points for switch expression
…e-around-workspace-eventing

Delete unnecessary code around Workspace eventing
…duplicate-project-references

Ensure that MSBuildWorkspace deals with duplicate ProjectReferences
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 3fcc422 into features/readonly-members Feb 16, 2019
@ghost ghost deleted the merges/master-to-features/readonly-members branch February 16, 2019 02:00
This pull request was closed.
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.

5 participants