update FCS dependencies (#6388)

* update FCS dependencies * update FCS dependencies * fix up build * code review
dotnet · brettfo · Apr 5, 2019 · Mar 20, 2019 · Mar 19, 2019 · Mar 21, 2019
commit f1aee5fbaea584c153ec3edcdde80b7db600a526
diff --git a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj
@@ -5,7 +5,7 @@
   <Import Project="..\fcs.props" />
   <Import Project="..\netfx.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -28,7 +28,7 @@
   <ItemGroup>
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />
-    <PackageReference Include="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="FSharp.Core" Version="4.6.2" />
     <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
     <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

diff --git a/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj b/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj
@@ -2,7 +2,7 @@
   <Import Project="..\fcs.props" />
   <Import Project="..\netfx.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
   <PropertyGroup>
@@ -20,14 +20,14 @@
       <Link>ProjectCrackerOptions.fs</Link>
     </Compile>
     <Compile Include="ProjectCracker.fs" />
-    <Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\net45" />
-    <Content Include="$(ArtifactsBinDir)\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net45" />
-    <Content Include="$(ArtifactsBinDir)\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net45" />
+    <Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\net461" />
+    <Content Include="$(ArtifactsBinDir)\fcs\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net461" />
+    <Content Include="$(ArtifactsBinDir)\fcs\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net461" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />
-    <PackageReference Include="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="FSharp.Core" Version="4.6.2" />
     <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
   </ItemGroup>
 </Project>
diff --git a/...FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCracker.targets b/...FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCracker.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0"     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Target Name="ProjectCrackerToolCopy" AfterTargets="Build">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" DestinationFolder="$(OutputPath)" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net461\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" DestinationFolder="$(OutputPath)" />
 </Target>
 </Project>
diff --git a/...arp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj b/...arp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj
@@ -6,7 +6,7 @@
   <Import Project="..\netfx.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -23,7 +23,7 @@
     <None Include="paket.references" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />
-    <PackageReference Include="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="FSharp.Core" Version="4.6.2" />
     <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
       <Private>false</Private>

diff --git a/fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj b/fcs/FSharp.Compiler.Service.Tests/CSharp_Analysis/CSharp_Analysis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\netfx.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);0067;1591</NoWarn>
   </PropertyGroup>

diff --git a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
@@ -5,7 +5,7 @@
   <Import Project="..\fcs.props" />
   <Import Project="..\netfx.props" />
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <NoWarn>$(NoWarn);44;75;</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -78,15 +78,15 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="FSharp.Core" Version="4.6.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="2.1.36" />
     <PackageReference Include="Dotnet.ProjInfo" Version="0.20.0" />
     <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="mscorlib" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />

diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -6,7 +6,7 @@
   <Import Project="..\netfx.props" />
   <Import Project="..\..\src\buildtools\buildtools.targets" />
  <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
@@ -635,7 +635,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="FSharp.Core" Version="4.6.2" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
   </ItemGroup>
@@ -647,7 +647,7 @@
     <PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
     <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />
     <Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

diff --git a/fcs/README.md b/fcs/README.md
@@ -12,12 +12,16 @@ Basically we are packaging up the compiler as a DLL and publishing it as a NuGet
 There are subtle differences between FSharp.Compiler.Service and FSharp.Compiler.Private (shipped with the Visual F# Tools)
 
 - FCS has a public API 
-- FCS is built against **.NET 4.5** and **FSharp.Core 4.0.0.0** to give broader reach
+
+- FCS is built against **.NET 4.6.1** and **FSharp.Core NuGet 4.6.2** to give broader reach
+
 - FCS has a NuGet package
-- FCS has a .NET Standard 1.6 version in the nuget package
+
+- FCS has a .NET Standard 2.0 version in the nuget package
+
 - FCS testing also tests the "Project Cracker" (see below)
-- FCS doesn't add the System.ValueTuple.dll reference by default, see ``#if COMPILER_SERVICE_AS_DLL`` in compiler codebase
 
+- FCS doesn't add the System.ValueTuple.dll reference by default, see ``#if COMPILER_SERVICE_AS_DLL`` in compiler codebase
 
 ## Version Numbers
 

diff --git a/fcs/RELEASE_NOTES.md b/fcs/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 23.0.1
+  * FSharp.Compiler.Service nuget now uses net461, netstandard2.0 and FSharp.Core 4.6.2
+
 #### 22.0.3
   * [Add entity.DeclaringEntity](https://github.com/Microsoft/visualfsharp/pull/4633), [FCS feature request](https://github.com/fsharp/FSharp.Compiler.Service/issues/830)
 
@@ -10,7 +13,7 @@
 
 #### 21.0.1
   * Use new .NET SDK project files
-  * FSharp.Compiler.Service nuget now uses net45 and netstandard2.0
+  * FSharp.Compiler.Service nuget now uses net461 and netstandard2.0
   * FSharp.Compiler.Service netstandard2.0 now supports type providers
 
 #### 19.0.1

diff --git a/fcs/build.fsx b/fcs/build.fsx
@@ -31,7 +31,7 @@ let dotnetExePath =
     if File.Exists(pathToCli) then
         pathToCli
     else
-        DotNetCli.InstallDotNetSDK "2.1.504"
+        DotNetCli.InstallDotNetSDK "2.2.105"
 
 let runDotnet workingDir args =
     let result =

diff --git a/fcs/docsrc/content/caches.fsx b/fcs/docsrc/content/caches.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Notes on the FSharpChecker caches
 =================================================

diff --git a/fcs/docsrc/content/compiler.fsx b/fcs/docsrc/content/compiler.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Hosted Compiler
 ===============

diff --git a/fcs/docsrc/content/corelib.fsx b/fcs/docsrc/content/corelib.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Notes on FSharp.Core.dll
 =================================================

diff --git a/fcs/docsrc/content/editor.fsx b/fcs/docsrc/content/editor.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Editor services
 ==================================

diff --git a/fcs/docsrc/content/filesystem.fsx b/fcs/docsrc/content/filesystem.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Virtualized File System
 ==========================================

diff --git a/fcs/docsrc/content/interactive.fsx b/fcs/docsrc/content/interactive.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Interactive Service: Embedding F# Interactive
 =============================================

diff --git a/fcs/docsrc/content/ja/compiler.fsx b/fcs/docsrc/content/ja/compiler.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラの組み込み
 ====================

diff --git a/fcs/docsrc/content/ja/corelib.fsx b/fcs/docsrc/content/ja/corelib.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス: FSharp.Core.dll についてのメモ
 ==================================================

diff --git a/fcs/docsrc/content/ja/editor.fsx b/fcs/docsrc/content/ja/editor.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス: エディタサービス
 ====================================

diff --git a/fcs/docsrc/content/ja/filesystem.fsx b/fcs/docsrc/content/ja/filesystem.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス: ファイルシステム仮想化
 ==========================================

diff --git a/fcs/docsrc/content/ja/interactive.fsx b/fcs/docsrc/content/ja/interactive.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 インタラクティブサービス: F# Interactiveの組み込み
 ==================================================

diff --git a/fcs/docsrc/content/ja/project.fsx b/fcs/docsrc/content/ja/project.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス: プロジェクトの分析
 ======================================

diff --git a/fcs/docsrc/content/ja/symbols.fsx b/fcs/docsrc/content/ja/symbols.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス: シンボルの処理
 ==================================

diff --git a/fcs/docsrc/content/ja/tokenizer.fsx b/fcs/docsrc/content/ja/tokenizer.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス：F#トークナイザを使用する
 ============================================

diff --git a/fcs/docsrc/content/ja/untypedtree.fsx b/fcs/docsrc/content/ja/untypedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net45"
+#I "../../../../artifacts/bin/fcs/net461"
 (**
 コンパイラサービス：型無し構文木の処理
 ======================================

diff --git a/fcs/docsrc/content/project.fsx b/fcs/docsrc/content/project.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Project Analysis
 ==================================
@@ -324,7 +324,7 @@ into the output folder of your application by the build process. If
 you install using Paket or NuGet, then this will be configured for you
 automatically. If not, you should reference the provided `.targets`
 file manually in your application. This can be found in the NuGet
-package at `build/net45/FSharp.Compiler.Service.ProjectCrackerTool.targets`.
+package at `build/net461/FSharp.Compiler.Service.ProjectCrackerTool.targets`.
 
 The reason for this split was so the analysis of an F# project
 file is performed out of process, in order that the necessary assembly

diff --git a/fcs/docsrc/content/queue.fsx b/fcs/docsrc/content/queue.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Notes on the FSharpChecker operations queue
 =================================================

diff --git a/fcs/docsrc/content/react.fsx b/fcs/docsrc/content/react.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Reacting to Changes
 ============================================
@@ -19,7 +19,7 @@ referenced DLLs may change on disk, or referenced files may change.
 The ``FSharpChecker`` component from FSharp.Compiler.Service does _not_ actively "listen"
 to changes in the file system.  However ``FSharpChecker`` _does_ repeatedly ask for
 time stamps from the file system which it uses to decide if recomputation is needed.
-FCS doesn�t listen for changes directly - for example, it creates no ``FileWatcher`` object (and the
+FCS doesn't listen for changes directly - for example, it creates no ``FileWatcher`` object (and the
 ``IFileSystem`` API has no ability to create such objects).  This is partly for legacy reasons,
 and partly because some hosts forbid the creation of FileWatcher objects.
 
@@ -33,7 +33,7 @@ stays up-to-date when changes are observed.
 
 If you want to more actively listen for changes, then you should add watchers for the
 files specified in the ``DependencyFiles`` property of ``FSharpCheckFileResults`` and ``FSharpCheckProjectResults``.
-Here�s what you need to do: 
+Here�s what you need to do: 
 
 * When your client notices an CHANGE event on a DependencyFile, it should schedule a refresh call to perform the ParseAndCheckFileInProject (or other operation) again.
   This will result in fresh FileSystem calls to compute time stamps.
@@ -42,8 +42,8 @@ Here
   for all active projects in which the file occurs. This will result in fresh FileSystem calls to compute time 
   stamps, and fresh calls to compute whether files exist.
 
-* Generally clients don�t listen for DELETE events on files.  Although it would be logically more consistent 
-  to do so, in practice it�s very irritating for a "project clean" to invalidate all intellisense and 
+* Generally clients don�t listen for DELETE events on files.  Although it would be logically more consistent 
+  to do so, in practice it�s very irritating for a "project clean" to invalidate all intellisense and 
   cause lots of red squiggles.  Some source control tools also make a change by removing and adding files, which 
   is best noticed as a single change event.
 

diff --git a/fcs/docsrc/content/symbols.fsx b/fcs/docsrc/content/symbols.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Working with symbols
 ============================================

diff --git a/fcs/docsrc/content/tokenizer.fsx b/fcs/docsrc/content/tokenizer.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Using the F# tokenizer
 =========================================

diff --git a/fcs/docsrc/content/typedtree.fsx b/fcs/docsrc/content/typedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Processing typed expression tree
 =================================================

diff --git a/fcs/docsrc/content/untypedtree.fsx b/fcs/docsrc/content/untypedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net45"
+#I "../../../artifacts/bin/fcs/net461"
 (**
 Compiler Services: Processing untyped syntax tree
 =================================================

diff --git a/fcs/docsrc/tools/generate.fsx b/fcs/docsrc/tools/generate.fsx
@@ -32,7 +32,7 @@ open FSharp.MetadataFormat
 let root = "."
 
 // Paths with template/source/output locations
-let bin         = __SOURCE_DIRECTORY__ @@ "../../../release/fcs/net45"
+let bin         = __SOURCE_DIRECTORY__ @@ "../../../release/fcs/net461"
 let content     = __SOURCE_DIRECTORY__ @@ "../content"
 let output      = __SOURCE_DIRECTORY__ @@ "../../../docs"
 let files       = __SOURCE_DIRECTORY__ @@ "../files"