Fix merge to only update core-setup and Roslyn versions.
Fix merge to only update core-setup and Roslyn versions.

livarcocc/cli-1,svick/cli,johnbeisner/cli,johnbeisner/cli,livarcocc/cli-1,dasMulli/cli,dasMulli/cli,svick/cli,dasMulli/cli,svick/cli,johnbeisner/cli,livarcocc/cli-1