Skip to content

Merge master to master-vs-deps#45854

Merged
141 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps
Jul 10, 2020
Merged

Merge master to master-vs-deps#45854
141 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps

Conversation

@dotnet-bot
Copy link
Collaborator

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 --force

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

CyrusNajmabadi and others added 30 commits October 7, 2019 14:24
…c-lambdas

Merge master to features/static-lambdas
…c-lambdas

Merge master to features/static-lambdas
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

RikkiGibson and others added 2 commits July 9, 2020 18:01
…latest design. (#45831)

Related to #45296.

From specification:
If the record is derived from `object`, the record type includes a synthesized readonly property equivalent to a property declared as follows:
```C#
protected Type EqualityContract { get; };
```
The property is `virtual` unless the record type is `sealed`.
The property can be declared explicitly. It is an error if the explicit declaration does not match the expected signature or accessibility, or if the explicit declaration doesn't allow overiding it in a derived type and the record type is not `sealed`.

If the record type is derived from a base record type `Base`, the record type includes a synthesized readonly property equivalent to a property declared as follows:
```C#
protected override Type EqualityContract { get; };
```

The property can be declared explicitly. It is an error if the explicit declaration does not match the expected signature or accessibility, or if the explicit declaration doesn't allow overiding it in a derived type and the record type is not `sealed`. It is an error if either synthesized, or explicitly declared property doesn't override a property with this signature in the record type `Base` (for example, if the property is missing in the `Base`, or sealed, or not virtual, etc.).
The synthesized property returns `typeof(R)` where `R` is the record type.
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 32da3079bf933335ce687a6e4dc0dc8996c378ef

@ghost ghost merged commit ec2c0bc into master-vs-deps Jul 10, 2020
@ghost ghost deleted the merges/master-to-master-vs-deps branch July 10, 2020 04:26
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch July 10, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch July 10, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch July 10, 2020 09:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch July 10, 2020 09:02
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch July 10, 2020 12:03
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch July 10, 2020 12:03
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.

10 participants