Skip to content

Merge master into features/embeddedJson#26024

Merged
jmarolf merged 285 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:merge1
Apr 9, 2018
Merged

Merge master into features/embeddedJson#26024
jmarolf merged 285 commits intodotnet:features/embeddedJsonfrom
CyrusNajmabadi:merge1

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

No description provided.

Neme12 and others added 30 commits March 18, 2018 14:30
This change moves the MSBuildWorkspace tests to a separate project and introduces infrastructure to get them
running. Essentially, each test is marked with a `ConditionalFact` with `VisualStudioMSBuildInstalled` as the
skip condition. That skip condition uses the VS 2017 setup APIs to locate installed instances of VS and finds
one that contains the Roslyn Compiler package. Then, it sets up an AssemblyResolve event on the current AppDomain
to resolve MSBuild locations from VS itself. This ensures that MSBuild can locate a toolset containing the
necessary props and targets to handle the projects in our tests.
Neme12 and others added 23 commits April 5, 2018 20:37
* Produce errors on invalid pdbpath supplied to compiler

* More tests
While implementing the tests for the ref-reassignment test plan (dotnet#22466)
I found a bug in the handling of the ref-escape scope of a ref local in foreach. That bug is fixed
and the rest of the items in the test plan should have a test.

Fixes dotnet#22466
Fixing async keyword highlighting on local functions
Adding missing completion after 'ref'
 Not offering UseAutoProperty for volatile fields & when field used with ref
Branchless codegen for lifted nullable operators
* moving methods around to clean things up.

* more clean up

* added comment

* more code re-arrange

* revert some clean up back since that requires some changes I dont want to do for clean up
Place '#pragma warning restore' in better location with multi-line statements
@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners April 8, 2018 19:04
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Tagging @jcouv @jmarolf

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jcouv can you merge in?

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jmarolf can you merge in these simple feature-branch merges? Thanks!

@jmarolf jmarolf merged commit 0cfe55a into dotnet:features/embeddedJson Apr 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.