Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.6 into release/dev16.6-vs-deps.

git fetch --all
git checkout merges/release/dev16.6-to-release/dev16.6-vs-deps
git reset --hard upstream/release/dev16.6-vs-deps
git merge upstream/release/dev16.6
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.6-to-release/dev16.6-vs-deps --force

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

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

@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.6-to-release/dev16.6-vs-deps to b3c241694268469e6254e81ba1d7092c35c6589f

@dotnet-bot dotnet-bot requested a review from a team as a code owner April 27, 2020 20:06
@agocke
Copy link
Member

agocke commented Apr 27, 2020

@genlu I don't think this will pass until a fix for the integration test issue is included

jasonmalinowski and others added 2 commits April 27, 2020 15:49
Do not install Roslyn.VisualStudio.InteractiveComponents.vsix for integration tests
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.6-to-release/dev16.6-vs-deps to 8c3cb3f319f6fc258520edf2dfa8cfcd22878daf

…sts-in-dev16.6

Disable failing IntelliSense integration tests
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.6-to-release/dev16.6-vs-deps to 72dd563310f6e15d225e7437e397d7c10bc42aca

@ghost ghost merged commit 9bc8f80 into release/dev16.6-vs-deps Apr 28, 2020
@ghost ghost deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 07:44
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 09:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 09:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 12:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 12:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 15:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 15:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 18:03
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 18:03
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 21:09
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 28, 2020 21:09
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 00:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 00:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 03:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 03:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 09:08
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 09:08
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 12:03
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 12:03
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 15:03
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 15:03
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 18:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 18:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 21:04
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 29, 2020 21:04
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.

9 participants