Merge remote-tracking branch 'upstream/vs2017-rtm'

setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr

@@ -3,7 +3,11 @@ use vs
 package name=Microsoft.FSharp.SDK.Core
         version=$(FSharpPackageVersion)
         vs.package.type=msi
-        vs.package.installSize=37223424
+
+vs.installSize
+  SystemDrive=194670592
+  TargetDrive=0
+  SharedDrive=0
 
 vs.payloads
   vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi"

setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr

@@ -4,7 +4,11 @@ package name=Microsoft.FSharp.SDK.Resources
         version=$(FSharpPackageVersion)
         vs.package.type=msi
         vs.package.language=$(LocaleSpecificCulture)
-        vs.package.installSize=13854720
+
+vs.installSize
+  SystemDrive=12681438
+  TargetDrive=0
+  SharedDrive=0
 
 vs.payloads
   vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi"

vsintegration/Vsix/RegisterFsharpPackage.pkgdef

@@ -170,6 +170,7 @@
 [$RootKey$\Languages\Language Services\FSharpInteractive]
 "Package"="{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}"
 "NotALanguage"="1"
+"RequestStockColors"=dword:00000001
 @="{35a5e6b8-4012-41fc-a652-2cdc56d74e9f}"
 
 [$RootKey$\FontAndColors\FSharpInteractive]

vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs

@@ -210,6 +210,7 @@ type
                              DefaultToInsertSpaces = true,
                              CodeSense = true,
                              DefaultToNonHotURLs = true,
+                             RequestStockColors = true,
                              EnableCommenting = true,
                              CodeSenseDelay = 100,
                              ShowDropDownOptions = true)>]