fcs shape fixes and net5.0 bump

TheAngryByrd · Nov 12, 2020 · 531d62a · 531d62a
1 parent cd8ff5c
commit 531d62a
Show file tree

Hide file tree

Showing 36 changed files with 973 additions and 1,004 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "fake-cli": {
-      "version": "5.20.2",
+      "version": "5.20.4-alpha.1642",
       "commands": [
         "fake"
       ]
     },
     "paket": {
-      "version": "5.247.4",
+      "version": "5.251.0",
       "commands": [
         "paket"
       ]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,11 +4,12 @@ on: [push, pull_request]
 
 jobs:
   build:
-
+    timeout-minutes: 15 # we have a locking issue, so cap the runs at ~15m to account for varying build times, etc
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        dotnet: [3.1.201]
+        dotnet: [5.0.100]
+      fail-fast: false # we have timing issues on some OS, so we want them all to run
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build_debug_netcore",
-            "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/netcoreapp2.1/fsautocomplete.dll",
+            "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net5.0/fsautocomplete.dll",
             "args": ["--mode", "lsp"],
             "cwd": "${workspaceFolder}",
             "console": "internalConsole",
@@ -21,17 +21,29 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build_lsp_tests",
-            "program": "${workspaceFolder}/test/FsAutoComplete.Tests.Lsp/bin/Debug/netcoreapp2.1/FsAutoComplete.Tests.Lsp.dll",
+            "program": "${workspaceFolder}/test/FsAutoComplete.Tests.Lsp/bin/Debug/net5.0/FsAutoComplete.Tests.Lsp.dll",
             "cwd": "${workspaceFolder}",
             "console": "integratedTerminal",
             "stopAtEntry": false,
+            "justMyCode": false,
+            "symbolOptions": {
+              "searchPaths": [],
+              "searchMicrosoftSymbolServer": true,
+              "searchNuGetOrgSymbolServer": true
+            },
+            "sourceLinkOptions": {
+              "*": {
+                "enabled": true
+              }
+            },
+            "enableStepFiltering": false
         },
         {
             "name": ".NET Core mode stdio (debug)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build_debug_netcore",
-            "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/netcoreapp2.1/fsautocomplete.dll",
+            "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net5.0/fsautocomplete.dll",
             "args": ["--mode", "stdio", "-v"],
             "cwd": "${workspaceFolder}",
             "console": "integratedTerminal",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,7 @@
         {
             "taskName": "build_debug_netcore",
             "type": "shell",
-            "command": "dotnet build src/FsAutoComplete -f netcoreapp2.1",
+            "command": "dotnet build src/FsAutoComplete -f net5.0",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/build.fsx b/build.fsx
@@ -65,7 +65,7 @@ Target.create "LocalRelease" (fun _ ->
     DotNet.publish (fun p ->
        { p with
            OutputPath = Some (__SOURCE_DIRECTORY__ </> "bin/release_netcore")
-           Framework = Some "netcoreapp2.1"
+           Framework = Some "net5.0"
            Configuration = DotNet.BuildConfiguration.fromString configuration
            MSBuildParams = { MSBuild.CliArguments.Create () with Properties =  [ "SourceLinkCreate","true"; "Version", release.AssemblyVersion ] } }) "src/FsAutoComplete"
 

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.201"
+        "version": "5.0.100"
     }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,8 +1,9 @@
-version 5.241.6
+version 5.251.0
 
-framework: netstandard2.0, netcoreapp2.1
+framework: netstandard2.0, net5.0
 
 source https://api.nuget.org/v3/index.json
+source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 
 storage: none
 
@@ -11,7 +12,7 @@ github TheAngryByrd/FsLibLog:f81cba440bf0476bb4e2262b57a067a0d6ab78a7 src/FsLibL
 nuget Argu ~> 5.2.0
 nuget Fantomas ~> 4.0
 nuget Fantomas.Extras ~> 4.0
-nuget FSharp.Compiler.Service ~> 37.0
+nuget FSharp.Compiler.Service prerelease
 nuget Dotnet.ProjInfo.Workspace.FCS ~> 0.44.0
 nuget FSharp.Analyzers.SDK
 nuget FSharp.Data 3.0.1
@@ -21,7 +22,7 @@ nuget Mono.Cecil >= 0.10.0-beta7
 nuget Newtonsoft.Json
 nuget Fake.Runtime prerelease
 nuget FSharpLint.Core
-nuget FSharp.Core redirects:force
+nuget FSharp.Core ~> 5.0
 nuget Dapper
 nuget Microsoft.Data.Sqlite 2.2.4
 nuget Microsoft.Data.Sqlite.Core 2.2.4
@@ -44,6 +45,8 @@ group Build
   source https://api.nuget.org/v3/index.json
   storage: none
 
+  framework: netstandard2.0
+
   nuget Fake.Core.Target
   nuget Fake.Core.Process
   nuget Fake.DotNet.Cli
@@ -60,10 +63,12 @@ group Build
   nuget Microsoft.Build
 
 group Test
-  framework: netstandard2.0, netcoreapp2.1, netcoreapp3.1
+  framework: netstandard2.0, net5.0
+  source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   source https://api.nuget.org/v3/index.json
   storage: none
 
+  nuget FSharp.Core ~> 5.0
   nuget NUnit 3.10.1
   nuget NUnit3TestAdapter 3.10.0
   nuget Microsoft.NET.Test.Sdk 15.8.0