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 #12340

Merged
merged 19 commits into from Jul 5, 2016
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5d25d15
Merge pull request #12041 from heejaechang/buildsyncrace
heejaechang Jun 16, 2016
947e008
prevent VS from crashing if VS got shutdown while build error reporti…
heejaechang Jun 17, 2016
3b1cd3b
Update our NuGet package version to 1.3.2
jasonmalinowski Jun 21, 2016
9511aeb
Merge pull request #12060 from heejaechang/portfix11
jinujoseph Jun 21, 2016
e8adc17
Merge pull request #12134 from jasonmalinowski/update-microupdate-ver…
jasonmalinowski Jun 21, 2016
11cef7e
Update Microsoft.DiaSymReader.Native to 1.4.0 RTM (#12141)
tmat Jun 21, 2016
5a4408a
Enable building of release nuget packages.
shyamnamboodiripad May 24, 2016
e7828dd
Address code review feedback.
shyamnamboodiripad May 25, 2016
dafbb5c
Simplify script to use nuget.exe for prerelease dependency validation…
shyamnamboodiripad May 26, 2016
dcd75c6
Remove Microsoft.CodeAnalysis.EditorFeatures from list of prerelease …
shyamnamboodiripad Jun 14, 2016
04aa5dc
Change the name of the error log file to skipped_packages.txt.
shyamnamboodiripad Jun 14, 2016
d2a1512
Merge pull request #12194 from shyamnamboodiripad/microupdate-3.2
shyamnamboodiripad Jun 24, 2016
ec082ec
fixed DifferenceViewer leak
heejaechang Jun 22, 2016
f965b89
Merge pull request #12153 from heejaechang/leakfix2
heejaechang Jun 25, 2016
a59f56e
Merge remote-tracking branch 'dotnet/microupdate-3.2' into microupdate
jasonmalinowski Jun 27, 2016
ce70eb4
Merge pull request #12229 from jasonmalinowski/merge-microupdate-3.2-…
jasonmalinowski Jun 28, 2016
79ddbbd
Skipping the InteractiveWindow Clipboard UnitTests as they cannot run…
tannergooding Jun 29, 2016
290241b
Merge pull request #12322 from tannergooding/microupdate
tannergooding Jul 1, 2016
16a4b29
Merge remote-tracking branch 'upstream/microupdate' into master
jmarolf Jul 5, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.