Skip to content

Merge master to features/covariant-returns#46356

Merged
gafter merged 113 commits intofeatures/covariant-returnsfrom
merges/master-to-features/covariant-returns
Jul 29, 2020
Merged

Merge master to features/covariant-returns#46356
gafter merged 113 commits intofeatures/covariant-returnsfrom
merges/master-to-features/covariant-returns

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/covariant-returns.

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

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

sharwell and others added 30 commits May 21, 2020 09:29
Fixes: #32594.

This converts from a flat string to represent the command-line to an ImmutableArray<string> to avoid the string ending up on the LOH.
…etadata to consume the new function pointer metadata changes.
This updates our build to support the use of `net5.0` as a target
framework inside of our repository.

Note: this is back porting some changes from the covariant returns
branch. Wanted to get them into master sooner so we get more exposure to
them.
Add a canary test that fails on a runtime supporting covaraint returns to make sure we're testing CI
Backport #46237 to dev16.7: Report teh project name that we were unable to recover a symbol from.
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-features/covariant-returns to 5d1ba27f533402dc9b9616765ecc23b29d81abfa

@dotnet-bot dotnet-bot requested a review from a team July 29, 2020 00:03
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-features/covariant-returns to cd2d2d7cbf1927a52716b62b0e6bf9ddfe387cc5

sharwell and others added 3 commits July 28, 2020 20:26
Fix race condition in SolutionChecksumUpdater work queue
Fix formatting for multi-line patterns
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-features/covariant-returns to 729c5bed3029e713841cdcd9e43056009e627b35

Update GenerateHashCode tests to use new analyzer test framework.
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-features/covariant-returns to c5cd0f66c3c51b82ce1d70b8ce3453140e6ae7cc

Use ImmutableArray<string> instead of string for arguments
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-features/covariant-returns to bd49f95790d952ecd8822b0021918a740b029f14

@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-features/covariant-returns to 093ea477717001c58be6231cf2a793f4245cbf72

@dotnet-bot dotnet-bot added the Merge Conflicts There are merge conflicts with the base branch. label Jul 29, 2020
@gafter gafter removed the Merge Conflicts There are merge conflicts with the base branch. label Jul 29, 2020
@gafter gafter merged commit 56e7460 into features/covariant-returns Jul 29, 2020
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.