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/readonly-members #33421

Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/readonly-members.

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

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

KexyBiscuit and others added 10 commits January 31, 2019 12:54
…ing their results

I wasted a good few hours trying to work this out, so I hope this will save someone else the time :-)
leading and trailing comments on the open/close tokens as well
in csharp.
…mment

Expand RemoveAllComments to have more in depth logic and handle more corner cases in csharp
Add more information on running tests from the command line, and view…
* Update PublishData.json

Change lab/ml to master now that we're inserting our 16.1 payloads into VS master

* Add vsMajorVersion

This is needed for building VS bootstrapper for IBC training.
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 d733674 into features/readonly-members Feb 15, 2019
@ghost ghost deleted the merges/master-to-features/readonly-members branch February 15, 2019 21:00
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.

5 participants