Merge pull request #226 from ionide/bump-fsc-43-9-201

Update FCS to 43.9.201
ionide · Feb 13, 2025 · e1cd551 · e1cd551
2 parents 9a294eb + 17f537a
commit e1cd551
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,16 +25,16 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:  
           global-json-file: 'global.json'
+           #  9.0.101 because of https://github.com/dotnet/fsharp/issues/18298#issuecomment-2655277169
           dotnet-version: |
-            8.x
-            9.x
-
+            8.x 
+            9.0.101
       - name: Build
         run: dotnet fsi build.fsx
 
       - name: Upload documentation
         if: github.ref == 'refs/heads/main'
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./output
 
@@ -45,4 +45,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="CliWrap" Version="3.6.4" />
-    <PackageVersion Include="FSharp.Core" Version="[9.0.100]" />
-    <PackageVersion Include="FSharp.Compiler.Service" Version="[43.9.100]" />
+    <PackageVersion Include="FSharp.Core" Version="[9.0.201]" />
+    <PackageVersion Include="FSharp.Compiler.Service" Version="[43.9.201]" />
     <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" />

diff --git a/global.json b/global.json
@@ -1,6 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100",
-    "rollForward": "latestMinor"
+    "version": "9.0.101"
   }
 }
diff --git a/src/FSharp.Analyzers.SDK/ASTCollecting.fs b/src/FSharp.Analyzers.SDK/ASTCollecting.fs
@@ -288,14 +288,14 @@ module ASTCollecting =
             | SynExpr.InferredUpcast(expr = e)
             | SynExpr.InferredDowncast(expr = e)
             | SynExpr.AddressOf(expr = e)
-            | SynExpr.DoBang(e, _)
+            | SynExpr.DoBang(e, _, _)
             | SynExpr.YieldOrReturn(expr = e)
             | SynExpr.ArrayOrListComputed(expr = e)
             | SynExpr.ComputationExpr(expr = e)
             | SynExpr.Do(e, _)
             | SynExpr.Assert(e, _)
             | SynExpr.Lazy(e, _)
-            | SynExpr.YieldOrReturnFrom(_, e, _) -> walkExpr nextPath e
+            | SynExpr.YieldOrReturnFrom(_, e, _, _) -> walkExpr nextPath e
             | SynExpr.SequentialOrImplicitYield(expr1 = e1; expr2 = e2; ifNotStmt = ifNotE) ->
                 walkExpr nextPath e1
                 walkExpr nextPath e2
@@ -498,7 +498,7 @@ module ASTCollecting =
             | SynMemberDefn.Interface(t, _, members, _) ->
                 walkType nextPath t
                 members |> Option.iter (List.iter (walkMember nextPath))
-            | SynMemberDefn.Inherit(baseType = t) -> walkType nextPath t
+            | SynMemberDefn.Inherit(baseType = t) -> t |> Option.iter (walkType nextPath)
             | SynMemberDefn.ValField(field, _) -> walkField nextPath field
             | SynMemberDefn.NestedType(typeDefn = tdef) -> walkTypeDefn nextPath tdef
             | SynMemberDefn.AutoProperty(attributes = AllAttrs attrs; typeOpt = t; synExpr = e; range = _) ->