Update FSharp.Compiler.Service and FSharp.Core to the '9' versions (#222

) * Update FSharp.Compiler.Service and FSharp.Core to the '9' versions --------- Co-authored-by: Jimmy Byrd <[email protected]> Co-authored-by: Chet Husk <[email protected]>
ionide · Nov 19, 2024 · 17329bd · 17329bd
1 parent e1630a1
commit 17329bd
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 29 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,12 +2,6 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fantomas": {
-      "version": "6.3.4",
-      "commands": [
-        "fantomas"
-      ]
-    },
     "fsdocs-tool": {
       "version": "20.0.0",
       "commands": [

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,6 +23,11 @@ jobs:
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
+        with:  
+          global-json-file: 'global.json'
+          dotnet-version: |
+            8.x
+            9.x
 
       - name: Build
         run: dotnet fsi build.fsx

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,6 +20,12 @@ jobs:
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
+        with:  
+          global-json-file: 'global.json'
+          dotnet-version: |
+            8.x
+            9.x
+
 
       - name: Run Release Build
         run: dotnet fsi build.fsx -p ReleaseBuild

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,16 +2,17 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <MsBuildPackageVersion>17.2.0</MsBuildPackageVersion>
+    <NuGetAuditMode>direct</NuGetAuditMode>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="CliWrap" Version="3.6.4" />
-    <PackageVersion Include="FSharp.Core" Version="[8.0.400]" />
-    <PackageVersion Include="FSharp.Compiler.Service" Version="[43.8.400]" />
+    <PackageVersion Include="FSharp.Core" Version="[9.0.100]" />
+    <PackageVersion Include="FSharp.Compiler.Service" Version="[43.9.100]" />
     <PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" PrivateAssets="all" />
     <PackageVersion Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageVersion Include="Argu" Version="6.1.1" />
     <PackageVersion Include="Glob" Version="1.1.9" />
-    <PackageVersion Include="Ionide.ProjInfo.ProjectSystem" Version="0.65.0" />
+    <PackageVersion Include="Ionide.ProjInfo.ProjectSystem" Version="0.68.0" />
     <PackageVersion Include="Microsoft.Build" Version="$(MsBuildPackageVersion)" ExcludeAssets="runtime" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MsBuildPackageVersion)" ExcludeAssets="runtime" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MsBuildPackageVersion)" ExcludeAssets="runtime" />

diff --git a/build.fsx b/build.fsx
@@ -20,7 +20,8 @@ let buildStage =
 
 pipeline "Build" {
     restoreStage
-    stage "lint" { run "dotnet fantomas . --check" }
+    // TODO: can uncomment this after .NET SDK 9.0.101 releases
+    // stage "lint" { run "dotnet fantomas . --check" }
     stage "build" { run "dotnet build -c Release --no-restore -maxCpuCount" }
     stage "test" {
         purgeBinLogCache ()

diff --git a/docs/content/Unit Testing.fsx b/docs/content/Unit Testing.fsx
@@ -8,18 +8,18 @@ index: 5
 # Unit testing an analyzer
 
 To help analyzer authors testing their analyzers, there's a dedicated [testing package](https://www.nuget.org/packages/FSharp.Analyzers.SDK.Testing).
-It contains easy to use utility functions to create a context for the analyzer and assertion helpers.  
+It contains easy to use utility functions to create a context for the analyzer and assertion helpers.
 
-[`FSharp.Analyzers.SDK.Testing.mkOptionsFromProject`](../reference/fsharp-analyzers-sdk-testing.html#mkOptionsFromProject) creates the [`FSharpProjectOptions`](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-codeanalysis-fsharpprojectoptions.html) for the given framework (e.g. `net7.0`) and the given list of packages to reference.  
-[`FSharp.Analyzers.SDK.Testing.getContext`](../reference/fsharp-analyzers-sdk-testing.html#getContext) then takes the `FSharpProjectOptions` and the source code to test and creates a [`CliContext`](../reference/fsharp-analyzers-sdk-clicontext.html) you can pass along to your analyzer function.  
-The module [`FSharp.Analyzers.SDK.Testing.Assert`](../reference/fsharp-analyzers-sdk-testing-assert.html) offers various functions to help with assertion statements from your favorite unit testing framework.  
+[`FSharp.Analyzers.SDK.Testing.mkOptionsFromProject`](../reference/fsharp-analyzers-sdk-testing.html#mkOptionsFromProject) creates the [`FSharpProjectOptions`](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-codeanalysis-fsharpprojectoptions.html) for the given framework (e.g. `net7.0`) and the given list of packages to reference.
+[`FSharp.Analyzers.SDK.Testing.getContext`](../reference/fsharp-analyzers-sdk-testing.html#getContext) then takes the `FSharpProjectOptions` and the source code to test and creates a [`CliContext`](../reference/fsharp-analyzers-sdk-clicontext.html) you can pass along to your analyzer function.
+The module [`FSharp.Analyzers.SDK.Testing.Assert`](../reference/fsharp-analyzers-sdk-testing-assert.html) offers various functions to help with assertion statements from your favorite unit testing framework.
 For a complete example of an unit testing project, take a look at [`OptionAnalyzer.Test`](https://github.com/ionide/FSharp.Analyzers.SDK/tree/7b7ec530c507d765ab18d93ebb7aa45ab59accc2/samples/OptionAnalyzer.Test) in the `samples` folder of the SDK repository.
 *)
 
 (*** hide ***)
 #r "../../artifacts/bin/FSharp.Analyzers.Cli/release/FSharp.Compiler.Service.dll"
 #r "../../artifacts/bin/FSharp.Analyzers.SDK/release/FSharp.Analyzers.SDK.dll"
-#r "../../artifacts/bin/FSharp.Analyzers.SDK.Testing/release/FSharp.Analyzers.SDK.Testing.dll"
+#r "../../artifacts/bin/FSharp.Analyzers.SDK.Testing/release_net8.0/FSharp.Analyzers.SDK.Testing.dll"
 #r "../../artifacts/bin/OptionAnalyzer.Test/release/nunit.framework.dll"
 #r "../../artifacts/bin/OptionAnalyzer.Test/release/OptionAnalyzer.dll"
 (** *)
@@ -38,13 +38,10 @@ let Setup () =
             mkOptionsFromProject
                 "net7.0"
                 [
-                    // The SDK uses this in a "dotnet add package x --version y" command
-                    // to generate the needed FSharpProjectOptions
-                    {
-                        Name = "Newtonsoft.Json"
-                        Version = "13.0.3"
-                    }
-                ]
+                  // The SDK uses this in a "dotnet add package x --version y" command
+                  // to generate the needed FSharpProjectOptions
+                  { Name = "Newtonsoft.Json"
+                    Version = "13.0.3" } ]
 
         projectOptions <- opts
     }

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.200",
+    "version": "9.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj b/samples/OptionAnalyzer.Test/OptionAnalyzer.Test.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RollForward>LatestMajor</RollForward>
 
         <IsPackable>false</IsPackable>

diff --git a/samples/OptionAnalyzer/OptionAnalyzer.fsproj b/samples/OptionAnalyzer/OptionAnalyzer.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj b/src/FSharp.Analyzers.Cli/FSharp.Analyzers.Cli.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <OutputType>Exe</OutputType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/src/FSharp.Analyzers.SDK.Testing/FSharp.Analyzers.SDK.Testing.fsproj b/src/FSharp.Analyzers.SDK.Testing/FSharp.Analyzers.SDK.Testing.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net8.0; net9.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/FSharp.Analyzers.SDK/ASTCollecting.fs b/src/FSharp.Analyzers.SDK/ASTCollecting.fs
@@ -136,6 +136,7 @@ module ASTCollecting =
             | SynTypeConstraint.WhereTyparIsReferenceType(t, _)
             | SynTypeConstraint.WhereTyparIsUnmanaged(t, _)
             | SynTypeConstraint.WhereTyparSupportsNull(t, _)
+            | SynTypeConstraint.WhereTyparNotSupportsNull(t, _, _)
             | SynTypeConstraint.WhereTyparIsComparable(t, _)
             | SynTypeConstraint.WhereTyparIsEquatable(t, _) -> walkTypar path t
             | SynTypeConstraint.WhereTyparDefaultsToType(t, ty, _)
@@ -245,6 +246,8 @@ module ASTCollecting =
             | SynType.StaticConstant _ -> ()
             | SynType.StaticConstantExpr _ -> ()
             | SynType.StaticConstantNamed _ -> ()
+            | SynType.StaticConstantNull _ -> ()
+            | SynType.WithNull(innerType, _, _, _) -> walkType nextPath innerType
             | SynType.Paren(innerType, _) -> walkType nextPath innerType
             | SynType.SignatureParameter(usedType = t; range = _) -> walkType nextPath t
             | SynType.Or(lhsType = lhs; rhsType = rhs) ->

diff --git a/src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj b/src/FSharp.Analyzers.SDK/FSharp.Analyzers.SDK.fsproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>