Merge master to master-vs-deps #44574
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a punch through to support simple single file scenarios. Related to #41704.
Merge 'dotnet/master' into SimplePrograms
Adjustments to the parser behavior for a Simple Program - Follow up on parser changes that came from master - Presence of attributes shouldn’t disable parsing of a top-level statement. Instead, the attributes should be attached to the top-level statement with an error reported, or without an error if the statement is a local function declaration. - Allow a declaration of a `ref` local at the top level.
Merge 'master' into SimplePrograms
…ram. (#42648) Related to #41704. Reflects design changes outlined in dotnet/csharplang#3292.
…arily disable two IDE tests.
Merge master into SimplePrograms
Related to #41704. - Add tests for missing types that the feature depends upon. - Adjust binding to produce a ```BoundNonConstructorMethodBody``` as the root of the bound body to be consistent with other flavors of ```BindMethodBody```. - Report an error when a "MainType" is speciafied for a Simple Program. - Improve parsing error recovery around local functions.
Merge master into SimplePrograms
Merge master into SimplePrograms
Collaborator
Author
|
Reset HEAD of |
Install dotnet sdk explicitly for RichNav CI
This reverts commit 680a020.
Completion fixes for top-level statements
Fix regression in lambda intellisense.
Merge 'dotnet/master' into SimplePrograms
Collaborator
Author
|
Reset HEAD of |
genlu
removed
the
Merge Conflicts
…view2-to-master Merges/release/dev16.7 preview2 to master
Collaborator
Author
|
Reset HEAD of |
….CtrlAltSpaceOption unit-test with Top-level statements in mind.
Update the work around for .editorconfig evaluation bugs in command l…
Collaborator
Author
|
Reset HEAD of |
Merge 'Top-level statements' feature into master
Revert "Refactoring of Active Statement tracking for OOP"
Collaborator
Author
|
Reset HEAD of |
ghost
added this to the
Member
|
Thanks @jasonmalinowski! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.