nosami · nosami · Nov 29, 2019 · Nov 30, 2019 · Dec 10, 2019 · Dec 16, 2019
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/Directory.Build.targets b/Directory.Build.targets
diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props
diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -4,10 +4,10 @@
     <UsingToolXUnit>false</UsingToolXUnit>
     <!-- opt-in properties -->
     <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
-    <UsingToolNuGetRepack>true</UsingToolNuGetRepack>
-    <UsingToolSourceLink>true</UsingToolSourceLink>
-    <UsingToolSymbolUploader>true</UsingToolSymbolUploader>
-    <UsingToolVSSDK>true</UsingToolVSSDK>
+    <!-- <UsingToolNuGetRepack>true</UsingToolNuGetRepack> -->
+    <!-- <UsingToolSourceLink>true</UsingToolSourceLink> -->
+    <!-- <UsingToolSymbolUploader>true</UsingToolSymbolUploader> -->
+    <!-- <UsingToolVSSDK>true</UsingToolVSSDK> -->
   </PropertyGroup>
   <!-- Version number computation -->
   <PropertyGroup>

diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
     <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>

diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
     <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstant)</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>

diff --git a/vsintegration/Directory.Build.props b/vsintegration/Directory.Build.props
diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets
diff --git a/vsintegration/src/Directory.Build.props b/vsintegration/src/Directory.Build.props
diff --git a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs
@@ -12,7 +12,6 @@ open Microsoft.VisualStudio.Text.BraceCompletion
 open Microsoft.VisualStudio.Text.Operations
 open Microsoft.VisualStudio.Text
 open Microsoft.VisualStudio.Text.Editor
-open Microsoft.VisualStudio.Utilities
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Host
@@ -504,7 +503,7 @@ type EditorBraceCompletionSessionFactory() =
                 null
 
 [<Export(typeof<IBraceCompletionSessionProvider>)>]
-[<ContentType(FSharpConstants.FSharpContentTypeName)>]
+[<Microsoft.VisualStudio.Utilities.ContentType(FSharpConstants.FSharpContentTypeName)>]
 [<BracePair(Parenthesis.OpenCharacter, Parenthesis.CloseCharacter)>]
 [<BracePair(CurlyBrackets.OpenCharacter, CurlyBrackets.CloseCharacter)>]
 [<BracePair(SquareBrackets.OpenCharacter, SquareBrackets.CloseCharacter)>]

diff --git a/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinition.fs b/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinition.fs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace Microsoft.VisualStudio.FSharp.Editor
+
+open Microsoft.VisualStudio.Text.Classification
+open System.ComponentModel.Composition
+open System
+open System.Windows.Media
+open Microsoft.VisualStudio.Language.StandardClassification
+
+module internal ClassificationDefinition =
+    [<Export>]
+    [<Microsoft.VisualStudio.Utilities.Name(FSharpClassificationTypes.MutableVar)>]
+    [<Microsoft.VisualStudio.Utilities.BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)>]
+    let FSharpMutableVarClassificationType : ClassificationTypeDefinition = null
+
+[<Export(typeof<EditorFormatDefinition>)>]
+[<ClassificationType(ClassificationTypeNames = FSharpClassificationTypes.MutableVar)>]
+[<Microsoft.VisualStudio.Utilities.Name(FSharpClassificationTypes.MutableVar)>]
+[<UserVisible(true)>]
+[<Microsoft.VisualStudio.Utilities.Order(After = "keyword")>]
+type internal FSharpMutableVarTypeFormat() as self =
+    inherit EditorFormatDefinition()
+
+    do self.DisplayName <- SR.FSharpMutableVarsClassificationType()
+       self.ForegroundColor <- Nullable(Color.FromRgb(255uy, 210uy, 28uy))