Bump to FCS 40 (#682)

* initial work to bump to FCS 40

* build/publish on net5 only

* Fix a few references to netcoreapp3.1, as well as warnings

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "fake-cli": {
-      "version": "5.20.3",
+      "version": "5.20.4",
       "commands": [
         "fake"
       ]
     },
     "paket": {
-      "version": "5.249.0",
+      "version": "6.0.0-rc002",
       "commands": [
         "paket"
       ]

.github/workflows/pull-requests.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        dotnet: [3.1.302, 5.0.100]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/push-master.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        dotnet: [3.1.302]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:

Directory.Build.props

@@ -7,8 +7,6 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <OtherFlags>/warnon:1182</OtherFlags>
-    <!-- we still can generate docs on netcoreapp3.1 -->
-    <OtherFlags>/langversion:4.7</OtherFlags>
   </PropertyGroup>
 
   <!-- NuGet Metadata -->

README.md

@@ -16,8 +16,8 @@ See https://fsprojects.github.io/FSharp.Formatting/
 One built you can run the command-line tool to self-build the docs for this directory using 
 
     dotnet build
-    src\FSharp.Formatting.CommandTool\bin\Debug\netcoreapp3.1\fsdocs.exe watch
-    src\FSharp.Formatting.CommandTool\bin\Debug\netcoreapp3.1\fsdocs.exe build --clean
+    src\FSharp.Formatting.CommandTool\bin\Debug\net5.0\fsdocs.exe watch
+    src\FSharp.Formatting.CommandTool\bin\Debug\net5.0\fsdocs.exe build --clean
 
 
 ## Maintainer(s)

build.fsx

@@ -90,7 +90,7 @@ Target.create "Tests" (fun _ ->
         { opts with
             Blame = true
             NoBuild = true
-            Framework = if Environment.isWindows then opts.Framework else Some "netcoreapp3.1"
+            Framework = Some "net5.0"
             Configuration = configuration
             ResultsDirectory = Some "TestResults"
             Logger = Some "trx"

paket.dependencies

@@ -5,7 +5,7 @@ framework: auto-detect
 storage: none
 
 nuget FSharp.Core >= 4.7 lowest_matching:true
-nuget FSharp.Compiler.Service 39.0.0
+nuget FSharp.Compiler.Service 40.0.0
 nuget CommandLineParser ~> 2.8
 nuget Microsoft.Build.Framework
 nuget Microsoft.Build.Tasks.Core

src/FSharp.Formatting.ApiDocs/GenerateHtml.fs

@@ -5,7 +5,7 @@ open System.Collections.Generic
 open System.IO
 open System.Web
 open FSharp.Formatting.Common
-open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Symbols
 open FSharp.Formatting.Templating
 open FSharp.Formatting.HtmlModel
 open FSharp.Formatting.HtmlModel.Html