Skip to content

Merge dev15.7.x to dev15.8-preview1#26805

Merged
1 commit merged intodev15.8-preview1from
merges/dev15.7.x-to-dev15.8-preview1
May 11, 2018
Merged

Merge dev15.7.x to dev15.8-preview1#26805
1 commit merged intodev15.8-preview1from
merges/dev15.7.x-to-dev15.8-preview1

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from dev15.7.x into dev15.8-preview1.

git fetch --all
git checkout merges/dev15.7.x-to-dev15.8-preview1
git reset --hard upstream/dev15.8-preview1
git merge upstream/dev15.7.x
# Fix merge conflicts
git commit
git push merges/dev15.7.x-to-dev15.8-preview1 --force

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

Desktop signing uses a COM call into the CLR to sign an assembly,
which is not available on Mono or CoreCLR. This change always
uses portable signing by default on Mono as well as CoreCLR.
@dotnet-bot dotnet-bot requested a review from a team as a code owner May 11, 2018 21:19
Copy link
Copy Markdown

@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 916e011 into dev15.8-preview1 May 11, 2018
@ghost ghost deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 11, 2018 22:45
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 14, 2018 07:50
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.8-preview1 branch May 15, 2018 07:50
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