Update FSAC to use FCS and FSharp.Core from 9.0.100, as well as updated Analyzer SDK (ionide#1324)

Co-authored-by: Chet Husk <[email protected]>

Author: TheAngryByrd

.config/dotnet-tools.json

@@ -1,48 +1,34 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "paket": {
-      "version": "9.0.1",
-      "commands": [
-        "paket"
-      ],
-      "rollForward": false
-    },
-    "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.8",
-      "commands": [
-        "reportgenerator"
-      ],
-      "rollForward": false
-    },
-    "fantomas": {
-      "version": "6.3.11",
-      "commands": [
-        "fantomas"
-      ],
-      "rollForward": false
-    },
-    "fsharp-analyzers": {
-      "version": "0.27.0",
-      "commands": [
-        "fsharp-analyzers"
-      ],
-      "rollForward": false
-    },
-    "telplin": {
-      "version": "0.9.6",
-      "commands": [
-        "telplin"
-      ],
-      "rollForward": false
-    },
-    "easybuild.commitlinter": {
-      "version": "1.0.0",
-      "commands": [
-        "commit-linter"
-      ],
-      "rollForward": false
-    }
-  }
-}
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "paket": {
+      "version": "9.0.2",
+      "commands": [
+        "paket"
+      ],
+      "rollForward": false
+    },
+    "dotnet-reportgenerator-globaltool": {
+      "version": "5.3.8",
+      "commands": [
+        "reportgenerator"
+      ],
+      "rollForward": false
+    },
+    "fsharp-analyzers": {
+      "version": "0.28.0",
+      "commands": [
+        "fsharp-analyzers"
+      ],
+      "rollForward": false
+    },
+    "telplin": {
+      "version": "0.9.6",
+      "commands": [
+        "telplin"
+      ],
+      "rollForward": false
+    }
+  }
+}

.editorconfig

@@ -25,4 +25,8 @@ fsharp_max_function_binding_width=80
 fsharp_max_value_binding_width=80
 
 [src/FsAutoComplete/CodeFixes/*.fs]
-fsharp_experimental_keep_indent_in_branch = true
+fsharp_experimental_keep_indent_in_branch = true
+
+[test/**/*.expected]
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitattributes

@@ -25,3 +25,5 @@ configure.sh text eol=lf
 *.fs text eol=lf
 *.fsi text eol=lf
 *.fsx text eol=lf
+
+*.expected text eol=lf

.github/workflows/build.yml

@@ -18,15 +18,15 @@ jobs:
     env:
       TEST_TIMEOUT_MINUTES: 40
       FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
-      DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET 8 RCs to participate in rollforward as expected.
+      DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET RCs to participate in rollforward as expected.
     timeout-minutes: 40 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
     strategy:
       matrix:
         os:
           - windows-latest
           - macos-13 # using 13 because it's a bigger machine, and latest is still pointing to 12
           - ubuntu-latest
-        dotnet-version: ["", "6.0.x", "7.0.x", "8.0.x"]
+        dotnet-version: ["8.0.x", "9.0.x"]
         use-transparent-compiler:
           - "TransparentCompiler"
           - "BackgroundCompiler"
@@ -35,34 +35,20 @@ jobs:
           # - "ProjectGraph" # this is disable because it just adds too much time to the build
         # these entries will mesh with the above combinations
         include:
-          # just use what's in the repo
-          - global-json-file: "global.json"
-            dotnet-version: ""
-            include-prerelease: false
-            label: "repo global.json"
-            build_net7: false
-            test_tfm: net6.0
-          # latest 6.0
-          - global-json-file: "global.json"
-            dotnet-version: "6.0.x"
-            include-prerelease: false
-            label: "6.0"
-            build_net7: false
-            test_tfm: net6.0
-          # latest 7.0
-          - global-json-file: "global.json"
-            dotnet-version: "7.0.x"
-            include-prerelease: true
-            label: "7.0"
-            build_net7: true
-            test_tfm: net7.0
           # latest 8.0
           - global-json-file: "global.json"
             dotnet-version: "8.0.x"
-            include-prerelease: true
+            include-prerelease: false
             label: "8.0"
-            build_net8: true
+            build_net9: false
             test_tfm: net8.0
+          # latest 9.0
+          - global-json-file: "global.json"
+            dotnet-version: "9.0.x"
+            include-prerelease: true
+            label: "9.0"
+            build_net9: true
+            test_tfm: net9.0
       fail-fast: false # we have timing issues on some OS, so we want them all to run
 
     runs-on: ${{ matrix.os }}
@@ -78,16 +64,18 @@ jobs:
 
     # setup .NET per test session
     - name: Setup .NET
+      id : setup-dotnet
       uses: actions/setup-dotnet@v3
       with:
-        include-prerelease: ${{ matrix.include-prerelease }}
-        global-json-file: ${{ matrix.global-json-file }}
         dotnet-version: ${{ matrix.dotnet-version }}
 
     # remove global.json so that the env configuration takes precedence
     - name: Purge global.json
       run: rm global.json
 
+    - name: Create global.json
+      run: dotnet new globaljson --sdk-version '${{ steps.setup-dotnet.outputs.dotnet-version }}' --roll-forward latestMinor
+
     # let's make sure we're on the version we think we are.
     - name: Announce .NET version
       run: dotnet --info
@@ -96,6 +84,7 @@ jobs:
       run: dotnet tool restore
 
     - name: Check format
+      continue-on-error: true
       run: dotnet fantomas --check build.fsx src
       env:
         DOTNET_ROLL_FORWARD: LatestMajor
@@ -108,15 +97,13 @@ jobs:
     - name: Run Build
       run: dotnet build -c Release
       env:
-        BuildNet7: ${{ matrix.build_net7 }}
-        BuildNet8: ${{ matrix.build_net8 }}
+        BuildNet9: ${{ matrix.build_net9 }}
 
     - name: Run and report tests
       run: dotnet test -c Release -f ${{ matrix.test_tfm }} --no-restore --no-build  --logger "console;verbosity=normal" --logger GitHubActions /p:AltCover=true /p:AltCoverAssemblyExcludeFilter="System.Reactive|FSharp.Compiler.Service|Ionide.ProjInfo|FSharp.Analyzers|Analyzer|Humanizer|FSharp.Core|FSharp.DependencyManager" -- Expecto.fail-on-focused-tests=true --blame-hang --blame-hang-timeout 1m
       working-directory: test/FsAutoComplete.Tests.Lsp
       env:
-        BuildNet7: ${{ matrix.build_net7 }}
-        BuildNet8: ${{ matrix.build_net8 }}
+        BuildNet9: ${{ matrix.build_net9 }}
         USE_TRANSPARENT_COMPILER: ${{ matrix.use-transparent-compiler }}
         USE_WORKSPACE_LOADER: ${{ matrix.workspace-loader }}
 
@@ -133,7 +120,7 @@ jobs:
       run: dotnet tool restore
 
     - name: Run analyzers
-      run: dotnet build -t:AnalyzeSolution -p:TargetFramework=net6.0
+      run: dotnet build -t:AnalyzeSolution -p:TargetFramework=net8.0
 
     - name: Upload SARIF file
       uses: github/codeql-action/upload-sarif@v2

.github/workflows/release.yml

@@ -17,8 +17,7 @@ jobs:
         with:
           dotnet-version: |
            8.0.x
-           7.0.x
-           6.0.x
+           9.0.x
           include-prerelease: true
 
       - name: remove global.json so that 7.0 builds
@@ -30,7 +29,7 @@ jobs:
       - name: Run Build
         run: dotnet pack -c Release -o ./bin
         env:
-          BuildNet8: true
+          BuildNet9: true
 
       - name: Get Changelog Entry
         id: changelog_reader

benchmarks/benchmarks.fsproj

@@ -6,6 +6,8 @@
 
     <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SourceTextBenchmarks.fs" />

paket.dependencies

@@ -53,7 +53,7 @@ nuget Microsoft.Extensions.Caching.Memory
 nuget OpenTelemetry.Api >= 1.3.2
 nuget OpenTelemetry.Exporter.OpenTelemetryProtocol >= 1.3.2 # 1.4 bumps to 7.0 versions of System.Diagnostics libs, so can't use it
 nuget OpenTelemetry.Instrumentation.Runtime
-nuget LinkDotNet.StringBuilder
+nuget LinkDotNet.StringBuilder 1.18
 nuget CommunityToolkit.HighPerformance
 nuget System.Security.Cryptography.Pkcs
 nuget System.Net.Http