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/module-initializers #45634

Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/module-initializers.

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

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

allisonchou and others added 13 commits July 1, 2020 12:09
* Update AttributeTests.cs

* Update NullableReferenceTypesTests.cs

* Update NullableReferenceTypesTests.cs

* Fixed NullPointerException

* Removed duplicate test

* PR changes

* Added Robustness and Nullable Checks

* PR Changes

* Moved test to avoid merge conflict
Fixes #45465
Ensure we normalize the target scope passed to target symbol resolver. It doesn't handle the recently added 'namespaceanddescendants' scope in legacy target string format and expects it to be normalized to 'namespace' scope.
Fix issue preventing going to def on a complicated metadata symbol involving nullability and generics
Handle invalid dotnet_diagnostic entry without ID part in configurati…
…in records with the latest design. (#45601)

Related to #45296.

From specification:
If the record type is derived from a base record type Base, the record type includes a synthesized override of the strongly-typed Equals(Base other). The synthesized override is sealed. It is an error if the override is declared explicitly. The synthesized override returns Equals((object?)other).

This change also adjusts code-gen to properly compare EqualityContracts.
@dotnet-bot dotnet-bot requested review from a team as code owners July 3, 2020 00:03
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Jul 3, 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 8cd4e03 into features/module-initializers Jul 3, 2020
@ghost ghost deleted the merges/master-to-features/module-initializers branch July 3, 2020 03:58
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.

7 participants