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.

Sign up for GitHub

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

Jump to bottom

Merge dev15-rc3 into master #16551

Merged
merged 8 commits into from Jan 18, 2017
Merged

Merge dev15-rc3 into master #16551

merged 8 commits into from Jan 18, 2017

Conversation

ghost
Copy link

@ghost ghost commented Jan 17, 2017

This is an automatically generated pull request from dev15-rc3 into master.

@dotnet/roslyn-infrastructure:

git remote add vslsnap-roslyn "https://github.com/vslsnap/roslyn.git"
git fetch vslsnap-roslyn
git fetch upstream
git checkout merge-dev15-rc3-into-master-20170117-100134
git reset --hard upstream/master
git merge upstream/dev15-rc3
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-dev15-rc3-into-master-20170117-100134 --force

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

tmat and others added 8 commits January 11, 2017 16:45
@tmat
Remove CoreFX dependencies from Roslyn VSIX
3f77533
@heejaechang
changed WithXXX method to go through no validation code path
7a69be8
@heejaechang
make sure we use normalized string when creating analyzer reference c…
fc8692e 
…hecksum

make sure we use ordered list of document/projectIds when creating checksum
make sure we set HasAllInformation when creating projectInfo

added unit test
@heejaechang
Merge pull request #16421 from heejaechang/remoteHostCrash
bb4eee7 
fixed multiple issues that caused checksum mismatch
@tmat
Merge pull request #16453 from tmat/VsixCleanup
898dbc0 
Vsix cleanup
@tmat
Revert "Vsix cleanup"
97adaed
@ManishJayaswal
Merge pull request #16496 from dotnet/revert-16453-VsixCleanup
e087579 
Revert "Vsix cleanup"
@agocke
Add regression test for #16399 (#16471)
b2715a0 
* Add regression test for #16399

Closes #16399
@ghost
Copy link
Author

ghost commented Jan 17, 2017

@dotnet-bot test vsi please

@cston cston merged commit b2715a0 into dotnet:master Jan 18, 2017
@ghost ghost deleted the merge-dev15-rc3-into-master-20170117-100134 branch November 1, 2019 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla-already-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dnfclas @cston @tmat @heejaechang @ManishJayaswal @agocke