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 microupdate into master #12258

Merged
merged 17 commits into from Jun 30, 2016
Merged

Merge microupdate into master #12258

merged 17 commits into from Jun 30, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jun 28, 2016

This is an automatically generated pull request from microupdate 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-microupdate-into-master20160628-193714
git reset --hard upstream/master
git merge upstream/microupdate
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-microupdate-into-master20160628-193714 --force

Once the merge can be made and all the tests pass, you are free to merge the pull request.

heejaechang and others added 15 commits June 16, 2016 15:46
found one more case where documentId can be null
…sion-number

Update the Roslyn version to 1.3.2
This commit makes it so that we will always try to generate release nugets except if they depend on prerelease packages. If one of our nuget packages happens to depend on prerelease packages, then when building release nugets, we will simply print a message in the build output and skip release nuget generation for that package (and allow the overall build to succeed).
… instead of adding custom logic in the script for this.
Enable release nugets in microupdate-3.2 branch
this leak was responsible for about 14% of managed memory in customer's dump.

basically, in certain condition, if cancellation exception is thrown, we will not close difference viewer which cause
all text views to leak. that cause all taggers and text buffers to leak and that cause our preview workspaces to alive.
which in turn cause all solutions to alive and so on. all those objects (view, buffer, workspace, solution) are quite
big graphs. so ends up eat up 14% of memory.

added assert to make sure if we leak viewers again, we get some kind of notification.
@ghost
Copy link
Author

ghost commented Jun 28, 2016

@dotnet-bot test vsi please

…into-microupdate

Merge microupdate 3.2 into microupdate
@jasonmalinowski
Copy link
Member

@jmarolf something seems up here. There shouldn't be all those commits listed in this PR.

@jasonmalinowski
Copy link
Member

@dotnet-bot, test vsi please, since I did a push.

# Conflicts:
#	build/Targets/VSL.Versions.targets
#	src/EditorFeatures/Test/CodeActions/AbstractCodeActionTest.cs
#	src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs
@jmarolf
Copy link
Contributor

jmarolf commented Jun 30, 2016

test vsi please

@jmarolf
Copy link
Contributor

jmarolf commented Jun 30, 2016

test windows_vsi_p0_open_prtest please

@jmarolf
Copy link
Contributor

jmarolf commented Jun 30, 2016

test windows_vsi_p0_open_prtest please
test windows_vsi_p3_open_prtest please

@jmarolf
Copy link
Contributor

jmarolf commented Jun 30, 2016

test windows_vsi_p0_open_prtest please

1 similar comment
@jmarolf
Copy link
Contributor

jmarolf commented Jun 30, 2016

test windows_vsi_p0_open_prtest please

@jmarolf jmarolf merged commit 5ee3bdd into dotnet:master Jun 30, 2016
@jmarolf jmarolf deleted the merge-microupdate-into-master20160628-193714 branch June 30, 2016 23:43
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.

7 participants