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 release/3.0.1xx to master #3013

Merged
merged 2 commits into from Mar 15, 2019

Conversation

Projects
None yet
3 participants
@dotnet-bot
Copy link
Contributor

dotnet-bot commented Mar 8, 2019

This is an automatically generated pull request from release/3.0.1xx into master.

git fetch --all
git checkout merges/release/3.0.1xx-to-master
git reset --hard upstream/master
git merge upstream/release/3.0.1xx
# Fix merge conflicts
git commit
git push upstream merges/release/3.0.1xx-to-master --force

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

Update dependencies from https://github.com/dotnet/arcade build 20190…
…307.4 (#3012)

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19157.4
- Microsoft.DotNet.SignTool - 1.0.0-beta.19157.4
Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/r…
…elease/3.0.1xx-to-master

* upstream/release/3.0.1xx:
  Update dependencies from https://github.com/dotnet/arcade build 20190307.4 (#3012)

Conflicts:
eng/Version.Details.xml
eng/Versions.props
global.json

@livarcocc livarcocc force-pushed the merges/release/3.0.1xx-to-master branch from 24f8815 to 8ff6ad6 Mar 13, 2019

@dotnet-automerge-bot
Copy link
Collaborator

dotnet-automerge-bot left a comment

Auto-approval

@dotnet-automerge-bot dotnet-automerge-bot merged commit 933d6aa into master Mar 15, 2019

2 checks passed

license/cla All CLA requirements met.
public-CI (3) #20190312.3 succeeded
Details

@dotnet-automerge-bot dotnet-automerge-bot deleted the merges/release/3.0.1xx-to-master branch Mar 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.