Skip to content

Merge dev15.8-preview2 to master #27277

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

Merged
Shyam-Gupta merged 184 commits into from
Jun 1, 2018
Merged

Merge dev15.8-preview2 to master #27277

Changes from 1 commit
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
b39b92a
Merge pull request #24328 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 19, 2018
8fff952
Merge pull request #24341 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 22, 2018
c15daa5
Merge pull request #24368 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 22, 2018
45d234e
Merge pull request #24372 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 23, 2018
d9bffe9
Merge pull request #24384 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 23, 2018
ccb03c9
Merge pull request #24388 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 23, 2018
a931a4e
Migrate to latest editor bits in 15.6stg
olegtk Jan 24, 2018
85e94fc
convert 2 more handlers to simple ICommandHandler, no global service …
olegtk Jan 24, 2018
0add089
simplify command handler display names
olegtk Jan 24, 2018
d3f84a6
Merge pull request #24415 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 24, 2018
cbd9929
Merge pull request #24419 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 24, 2018
5918094
Merge pull request #24505 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 29, 2018
44552fa
Merge remote-tracking branch 'upstream/dev15.7.x' into merges/dev15.7…
agocke Jan 30, 2018
ef2602b
Merge pull request #24509 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 30, 2018
2edb456
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 30, 2018
b25d61b
Merge pull request #24534 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 30, 2018
177e72a
Merge pull request #24530 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 30, 2018
c989e4b
Merge pull request #24553 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Jan 31, 2018
6635887
Merge pull request #24556 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke Jan 31, 2018
51c0699
Merge pull request #24578 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
agocke Feb 2, 2018
6e9d56a
Merge dev15.7.x to dev15.7.x-vs-deps (#24598)
dotnet-bot Feb 2, 2018
f0979bc
Merge pull request #24634 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 5, 2018
b4879f7
Merge dev15.7.x to dev15.7.x-vs-deps (#24665)
dotnet-bot Feb 7, 2018
3146d7e
Merge pull request #24684 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 7, 2018
57a6455
fixed merge conflict
heejaechang Feb 7, 2018
b2a417c
Merge pull request #24688 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 8, 2018
f1eeace
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 8, 2018
c18bf5f
Merge pull request #24703 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 8, 2018
decfae4
Merge pull request #24727 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 9, 2018
c175e3a
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 9, 2018
a39a517
Merge pull request #24730 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 9, 2018
7a71038
Call the transaction creationg helper function and move it
jasonmalinowski Feb 9, 2018
4df1c51
Move helper out of FormatCommandHandler.TypeChar and into FormatComma…
jasonmalinowski Feb 9, 2018
e1fcb5f
Don't throw away the cancellation token from FormatCommandHandler.Typ…
jasonmalinowski Feb 9, 2018
396962f
Clean up ExecuteReturnOrTypeCommand
jasonmalinowski Feb 9, 2018
5ed5b9b
Remove some silly methods and use a helper in more places
jasonmalinowski Feb 9, 2018
918bc8e
Don't throw away the cancellation tokens
jasonmalinowski Feb 9, 2018
4398864
Remove dependency on Microsoft.VisualStudio.Text.UI.Wpf
jasonmalinowski Feb 10, 2018
8643e45
Remove packaging hack
jasonmalinowski Feb 10, 2018
ce2d8b3
Merge branch 'dev15.7.x-vs-deps' of https://github.com/dotnet/roslyn …
olegtk Feb 11, 2018
e7b8c76
Merge pull request #24757 from jasonmalinowski/fix-editorfeatures-wpf…
jasonmalinowski Feb 12, 2018
f5e8541
Merge pull request #24798 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 13, 2018
0c12ee5
Merge pull request #24433 from dotnet/dev/olegtk/CommandingMopup15.6P…
olegtk Feb 13, 2018
4f4da93
Add reference to tracking bug for package hack
jasonmalinowski Feb 13, 2018
f001d6a
Merge pull request #24818 from jasonmalinowski/add-comment-for-packag…
jasonmalinowski Feb 14, 2018
e5ee5aa
Merge remote-tracking branch 'dotnet/dev15.7.x-vs-deps' into fix-comm…
jasonmalinowski Feb 14, 2018
7206c3b
Merge pull request #24829 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 14, 2018
573dfa1
Merge pull request #24748 from jasonmalinowski/fix-command-handler-ca…
jasonmalinowski Feb 14, 2018
7d381c8
Publish only the desired package versions (#24843)
mmitche Feb 14, 2018
056715a
Manually generating a merge commit of 'origin/dev15.7.x' into 'origin…
AbhitejJohn Feb 14, 2018
b629eb4
Merge pull request #24858 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 15, 2018
0e67ff3
Merge remote-tracking branch 'origin/dev15.7.x' into merges/private-d…
AbhitejJohn Feb 15, 2018
11c4bb2
Redesign active statement handling during debugging (#24428)
tmat Feb 15, 2018
5fe4b68
Merge pull request #24855 from dotnet/merges/private-dev15.7.x-to-dev…
AbhitejJohn Feb 15, 2018
b7d1155
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 16, 2018
9596425
Merge pull request #24893 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 16, 2018
09128c9
Merge pull request #24889 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 16, 2018
d79822a
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 20, 2018
9abe5dc
Merge pull request #24928 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 20, 2018
9a7fc68
Merge pull request #24925 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
AbhitejJohn Feb 20, 2018
949eb30
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 21, 2018
d90dacb
Merge pull request #24971 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 21, 2018
c1e6ef0
Merge pull request #24987 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
AbhitejJohn Feb 22, 2018
6e3e0e1
Merge pull request #25014 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Feb 26, 2018
f3a0e31
Merge remote-tracking branch 'dotnet/dev15.7.x-vs-deps' into merges/d…
jasonmalinowski Feb 26, 2018
1abc826
Merge pull request #25060 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Feb 27, 2018
2fd305b
Merge pull request #25077 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Feb 27, 2018
37362c8
Restore MultiAdd helper to fix build break
jasonmalinowski Feb 28, 2018
2b31230
Merge pull request #25113 from jasonmalinowski/fix-dev15.7.x-vs-deps-…
jasonmalinowski Feb 28, 2018
cedcd60
Merge pull request #25115 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Feb 28, 2018
556d1f8
Merge remote-tracking branch 'upstream/dev15.6.x-vs-deps' into merges…
Shyam-Gupta Feb 28, 2018
826ec10
Merge pull request #25123 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Feb 28, 2018
f3fa4a9
Merge pull request #25121 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
Shyam-Gupta Feb 28, 2018
551cd82
Move GetImageMoniker() Glyph extension method from Editor.wpf to Edit…
JieCarolHu Mar 1, 2018
7c27374
Revert "Move GetImageMoniker() Glyph extension method from Editor.wpf…
JieCarolHu Mar 1, 2018
fcef664
Add GetImageId() Glyph extension method
JieCarolHu Mar 1, 2018
0586064
update GetImageMoniker() to use GetImageId()
JieCarolHu Mar 1, 2018
90eefa5
remove unused usings
JieCarolHu Mar 1, 2018
b1d4885
add an empty line between methods
JieCarolHu Mar 1, 2018
06fed70
use KnowImageIds
JieCarolHu Mar 2, 2018
b0b8905
Merge pull request #25142 from JieCarolHu/GetImageId
JieCarolHu Mar 2, 2018
d078bf2
Harden against errors reading active statement properties
tmat Mar 6, 2018
974a0cf
Use TrySet methods
tmat Mar 6, 2018
64d5578
Merge pull request #25280 from tmat/VSHang-P1
jinujoseph Mar 7, 2018
2602e45
Merge pull request #25321 from dotnet/merges/dev15.7-preview1-to-dev1…
jasonmalinowski Mar 7, 2018
0620326
Merge remote-tracking branch 'dotnet/dev15.7.x' into dev15.7.x-vs-deps
sharwell Mar 7, 2018
0140b54
Merge pull request #25155 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Mar 7, 2018
4a9ee0b
Merge pull request #25320 from dotnet/merges/dev15.7-preview1-vs-deps…
jasonmalinowski Mar 7, 2018
64db672
Merge pull request #25333 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 8, 2018
728159f
Merge pull request #25341 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
jasonmalinowski Mar 8, 2018
88b12d4
Merge pull request #25331 from dotnet/merges/dev15.7-preview1-vs-deps…
Shyam-Gupta Mar 8, 2018
1c22582
Merge pull request #25366 from dotnet/merges/dev15.7-preview1-to-dev1…
Shyam-Gupta Mar 9, 2018
edcca74
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.7.x-to-dev15.7.x-v…
tmat Mar 10, 2018
b4e858e
Merge pull request #25342 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 11, 2018
299c6c5
Insert packages to CoreXT store that were previously blocked (#25416)
tmat Mar 12, 2018
7402aa8
Merge from dev15.7.x
Shyam-Gupta Mar 12, 2018
aa5acf0
Merge remote-tracking branch 'upstream/dev15.7-preview1-vs-deps' into…
Shyam-Gupta Mar 12, 2018
743c837
Merge pull request #25417 from dotnet/merges/dev15.7-preview1-vs-deps…
jasonmalinowski Mar 12, 2018
98d186c
Remove binary that (correctly) doesn't exist anymore
jasonmalinowski Mar 13, 2018
8aba89c
Merge pull request #25418 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 13, 2018
f39a95c
Merge pull request #25442 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 13, 2018
d271819
Upgrade Editor and related nuget packages from 15.6.281-preview to 15…
JieCarolHu Mar 13, 2018
58b0351
Merge pull request #25462 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 14, 2018
f878230
update document to require VS15.7 preview 1
JieCarolHu Mar 14, 2018
25519ee
merge dev15.7.x-vs-deps
JieCarolHu Mar 14, 2018
2753997
resolve merge conflict
JieCarolHu Mar 14, 2018
e24fb40
fix PR comments
JieCarolHu Mar 14, 2018
b4eaa35
fix PR comments
JieCarolHu Mar 14, 2018
a28ffe5
fix PR comments
JieCarolHu Mar 14, 2018
52dc69a
Merge pull request #25457 from JieCarolHu/UpgradeEditorNuget
JieCarolHu Mar 15, 2018
70931f9
Merge pull request #25482 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 15, 2018
849db63
Merge branch 'dev15.7.x-vs-deps' into merges/dev15.6.x-vs-deps-to-dev…
Shyam-Gupta Mar 15, 2018
18663af
Merge pull request #25492 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
Shyam-Gupta Mar 15, 2018
9482d1a
Merge pull request #25504 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Mar 15, 2018
12e2ecc
Merge pull request #25513 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Mar 16, 2018
88c08df
Merge pull request #25523 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta Mar 16, 2018
c95a4c1
Merge pull request #25536 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Mar 19, 2018
a87bd67
Merge remote-tracking branch 'upstream/dev15.7.x' into merges/dev15.7…
tmeschter Mar 19, 2018
2be3c42
Move all build diagnostic info into Logs dir
jaredpar Mar 19, 2018
703b33e
Merge pull request #25597 from jaredpar/fix-d15-vs
jaredpar Mar 19, 2018
6f8b267
Merge pull request #25585 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 19, 2018
2e35a45
Merge pull request #25615 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 20, 2018
6355274
Merge pull request #25614 from dotnet/merges/dev15.6.x-to-dev15.6.x-v…
tmeschter Mar 20, 2018
897fc83
Merge remote-tracking branch 'dotnet/dev15.7.x' into merges/dev15.7.x…
jasonmalinowski Mar 20, 2018
fad5e92
Merge pull request #25632 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Mar 20, 2018
da72477
Merge pull request #25645 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 21, 2018
a9bb0d0
Merge pull request #25665 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 22, 2018
89c65ea
Merge pull request #25630 from dotnet/merges/dev15.6.x-vs-deps-to-dev…
tmeschter Mar 23, 2018
9850181
Merge pull request #25685 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 23, 2018
bff1470
Merge remote-tracking branch 'upstream/dev15.7-preview3' into dev15.7…
tmeschter Mar 27, 2018
1580ae0
Merge pull request #25717 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 28, 2018
dcb7607
Merge remote-tracking branch 'upstream/dev15.7-preview3' into dev15.7…
tmeschter Mar 28, 2018
4f87059
Merge pull request #25786 from dotnet/merges/dev15.7-preview3-vs-deps…
tmeschter Mar 28, 2018
ac525d7
Merge remote-tracking branch 'upstream/dev15.7-preview3-vs-deps' into…
tmeschter Mar 29, 2018
d0cddcb
Merge remote-tracking branch 'upstream/dev15.7.x' into merges/dev15.7…
tmeschter Mar 29, 2018
3731e4d
Merge pull request #25810 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 29, 2018
83241ae
Merge pull request #25818 from dotnet/dev15.7.x
tmeschter Mar 29, 2018
5fc0a67
Merge pull request #25809 from dotnet/merges/dev15.7-preview3-vs-deps…
tmeschter Mar 30, 2018
2450001
Merge pull request #25833 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
tmeschter Mar 30, 2018
eb8a3cf
Merge remote-tracking branch 'upstream/dev15.7.x' into merges/dev15.7…
jmarolf Apr 2, 2018
c1bc7f2
Merge pull request #25859 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jmarolf Apr 2, 2018
b334d93
Merge remote-tracking branch 'upstream/dev15.7.x' into merges/dev15.7…
jmarolf Apr 4, 2018
ca83e06
Merge pull request #25906 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 4, 2018
d087f6f
fix the KnownImageIds.LocalVariable which was missed in the previous PR
JieCarolHu Apr 5, 2018
7c3ee53
Merge pull request #25942 from JieCarolHu/fixImageId
Apr 5, 2018
47d8f50
Merge remote-tracking branch 'upstream/dev15.7.x' into merges/dev15.7…
jmarolf Apr 5, 2018
2c3d3e4
Merge pull request #25951 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jmarolf Apr 6, 2018
ac8a4e3
Merge pull request #26062 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
brettfo Apr 10, 2018
9081e39
Merge pull request #26086 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
brettfo Apr 11, 2018
79c7f8f
LOC CHECKIN | dotnet/roslyn dev15.7.x-vs-deps | 20180409
v-zbsail Apr 9, 2018
1c33035
Localize error messages in test
tmat Apr 13, 2018
8bd902d
Merge pull request #26137 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 13, 2018
7887295
Merge pull request #26134 from dotnet/pr/26030-loc-checkin-dotnet-ros…
tmeschter Apr 13, 2018
1a7ef4c
Merge pull request #26149 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 16, 2018
31b2765
Fix publish error
jaredpar Apr 16, 2018
ee0ef1a
Merge pull request #26182 from dotnet/dev/jaredpar/fix-pub
jaredpar Apr 16, 2018
3beafef
Merge pull request #26189 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 18, 2018
3596c0c
Merge pull request #26241 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 19, 2018
c1452f1
Fixes mapping of active statement when changing ctor body from block …
tmat Apr 19, 2018
d6c2708
Merge pull request #26280 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 20, 2018
68ca827
Merge pull request #26332 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
brettfo Apr 23, 2018
423a500
Merge pull request #26353 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski Apr 24, 2018
11653c9
Merge pull request #26363 from dotnet/dev15.7.x
jasonmalinowski Apr 24, 2018
941725e
Merge pull request #26375 from dotnet/dev15.7.x
jasonmalinowski Apr 25, 2018
689cba7
LOC CHECKIN | dotnet/roslyn dev15.7.x-vs-deps | 20180426
v-zbsail Apr 26, 2018
425244d
Merge pull request #26412 from v-zbsail/loc_201804243_dev15.7.x-vs-deps
tmeschter Apr 26, 2018
362ec0e
Merge pull request #26430 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
brettfo Apr 27, 2018
92afb5e
Merge pull request #26499 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
brettfo Apr 30, 2018
f592944
disable flaky test
brettfo Apr 30, 2018
dd6ee9c
Merge pull request #26511 from brettfo/disable-test
jasonmalinowski Apr 30, 2018
da55cf9
update nuget package moniker to `beta6`
brettfo Apr 30, 2018
e595ee2
Merge pull request #26519 from brettfo/build-moniker
brettfo Apr 30, 2018
1f28c67
Merge pull request #26562 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke May 3, 2018
e3245f7
Merge pull request #26638 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke May 4, 2018
f9e7e3b
Merge pull request #26807 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
agocke May 11, 2018
ff873b4
Merge pull request #26872 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
May 15, 2018
561df89
Merge pull request #26882 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
May 16, 2018
1c64cb7
Merge pull request #26913 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
May 16, 2018
2ad4aab
Merge pull request #26917 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
jasonmalinowski May 16, 2018
6247e1a
Merge pull request #27059 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta May 23, 2018
7aafab5
Merge pull request #27084 from dotnet/merges/dev15.7.x-to-dev15.7.x-v…
Shyam-Gupta May 23, 2018
8f372bb
Merge remote-tracking branch 'dotnet/dev15.7.x' into dev15.8-preview2
sharwell May 30, 2018
fb7b5f1
Merge pull request #27173 from dotnet/merges/dev15.7.x-to-dev15.8-pre…
Shyam-Gupta May 31, 2018
4d2412b
Merge branch 'master' into merges/dev15.8-preview2-to-master
tmat May 31, 2018
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
Prev Previous commit
Next Next commit
Merge pull request #25614 from dotnet/merges/dev15.6.x-to-dev15.6.x-v… 
…s-deps

Merge dev15.6.x to dev15.6.x-vs-deps
  • Loading branch information
@tmeschter
tmeschter authored Mar 20, 2018
commit 63552749d835d8cf9661e980017aa50018a201f1

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.