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 dev16.2 #6719

Merged
2 commits merged into from
May 13, 2019
Merged

Merge master to dev16.2 #6719

2 commits merged into from
May 13, 2019

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into dev16.2.

git fetch --all
git checkout merges/master-to-dev16.2
git reset --hard upstream/dev16.2
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-dev16.2 --force

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

KevinRansom and others added 2 commits May 13, 2019 10:12
* Start the wire up

* Redo using less memory

* Add asserts

* indent typo
* Update dependencies from https://github.com/dotnet/arcade build 20190511.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19261.1

* Update dependencies from https://github.com/dotnet/arcade build 20190512.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19262.1
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 5ade74b into dev16.2 May 13, 2019
@ghost ghost deleted the merges/master-to-dev16.2 branch May 13, 2019 20:00
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants