Skip to content

Merge master to master-vs-deps#45844

Merged
8 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps
Jul 9, 2020
Merged

Merge master to master-vs-deps#45844
8 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.

jasonmalinowski and others added 8 commits July 8, 2020 17:40
This annotation revealed a number of places where if some part of RQName
generation failed, we'd end up creating RQNode objects with null fields;
trying to convert that to the text would end up crashing. This adds
proper error handling when issues were discovered by analysis.
Nothing is using UnresolvedRQNode directly, so we can just flatten the
type hierarchy a bit.
* Standardize .NET Core / Standard references

This changes us to use standard references for our .NET Core and .NET
Standard unit test compilations.

The exception here is `netstandard1.3` usage which was not altered by this
change
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 16ec46f into master-vs-deps Jul 9, 2020
@ghost ghost deleted the merges/master-to-master-vs-deps branch July 9, 2020 22:46
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.

3 participants