Skip to content

Merge main to features/improved-definite-assignment#51866

Merged
70 commits merged intofeatures/improved-definite-assignmentfrom
merges/main-to-features/improved-definite-assignment
Mar 14, 2021
Merged

Merge main to features/improved-definite-assignment#51866
70 commits merged intofeatures/improved-definite-assignmentfrom
merges/main-to-features/improved-definite-assignment

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from main into features/improved-definite-assignment.

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

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout merges/main-to-features/improved-definite-assignment
git reset --hard upstream/features/improved-definite-assignment
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-features/improved-definite-assignment --force

Youssef1313 and others added 30 commits March 3, 2021 16:47
Use frozen-partial semantics when producing semantic classifications
…se/dev16.10

Merge release/dev16.9 to release/dev16.10
[main] Update dependencies from dotnet/arcade


 - Initialize RuntimeSourceFeed variables in tools.sh since Roslyn and others don't use /eng/common/build.sh
CyrusNajmabadi and others added 20 commits March 11, 2021 13:08
This changes our code to use the RTM version of the framework reference
assemblies rather than preview.

The RTM version though forces a reference to Microsoft.VisualBasic.dll
when building VB projects. That caused a compilation error in part of
our code because of the following pattern

```vb
For Each str in strings
```

In VB the identifier in the `For Each` is not necessarily a new
declaration but can also refer to existing identifiers. Hence this name
must go through standard name lookup.

Once the reference to Microsoft.VisualBasic.dll is added the
`Microsoft.VisualBasic.Conversions` module becomes available and the
method `Str` in that module is now a valid top level name. This causes
the above code to stop compiling. Fix is to use a non-conflicting
identifier.

closes #517711
Cancel outstanding work on tagger disconnect
Use ImmutableSegmentedDictionary in the analyzer driver
* Add component debugger support to target files
Simplify portions of symbol completion
Use RTM version of framework ref assemblies
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 8111455 into features/improved-definite-assignment Mar 14, 2021
@ghost ghost deleted the merges/main-to-features/improved-definite-assignment branch March 14, 2021 19:41
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.