Skip to content

Merge dev15.7.x to dev15.7.x-vs-deps#26807

Merged
agocke merged 1 commit intodev15.7.x-vs-depsfrom
merges/dev15.7.x-to-dev15.7.x-vs-deps
May 11, 2018
Merged

Merge dev15.7.x to dev15.7.x-vs-deps#26807
agocke merged 1 commit intodev15.7.x-vs-depsfrom
merges/dev15.7.x-to-dev15.7.x-vs-deps

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from dev15.7.x into dev15.7.x-vs-deps.

git fetch --all
git checkout merges/dev15.7.x-to-dev15.7.x-vs-deps
git reset --hard upstream/dev15.7.x-vs-deps
git merge upstream/dev15.7.x
# Fix merge conflicts
git commit
git push merges/dev15.7.x-to-dev15.7.x-vs-deps --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
@agocke agocke merged commit f9e7e3b into dev15.7.x-vs-deps May 11, 2018
@agocke agocke deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 11, 2018 22:10
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 14, 2018 07:50
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 15, 2018 07:50
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