From 08e61ae1c36094fa4afa783909fe7ce6723ec584 Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Wed, 12 Feb 2025 21:04:47 -0500 Subject: [PATCH 1/3] Update FCS to 43.9.201 --- Directory.Packages.props | 4 ++-- src/FSharp.Analyzers.SDK/ASTCollecting.fs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index dafb3bb..5e68311 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,8 +6,8 @@ - - + + diff --git a/src/FSharp.Analyzers.SDK/ASTCollecting.fs b/src/FSharp.Analyzers.SDK/ASTCollecting.fs index 18d9cef..901fc44 100644 --- 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 = _) -> From 096ed4fad97ef27d3078e4c190c72fda6d3b32b8 Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Wed, 12 Feb 2025 21:08:07 -0500 Subject: [PATCH 2/3] chore: maybe fix CI complaints --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 912ec1d..9baea08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - 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 From 17f537a7acd4559f2d7c6a2173bba8b17c90a23e Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Wed, 12 Feb 2025 21:21:23 -0500 Subject: [PATCH 3/3] force 9.0.101 sdk becaues of https://github.com/dotnet/fsharp/issues/18298#issuecomment-2655277169 --- .github/workflows/ci.yml | 6 +++--- global.json | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9baea08..5ba9774 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,10 +25,10 @@ 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 diff --git a/global.json b/global.json index 2bc13e8..b6b5c9f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,5 @@ { "sdk": { - "version": "9.0.100", - "rollForward": "latestMinor" + "version": "9.0.101" } }