diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c853e279..5f38a31ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,10 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ matrix.dotnet }} + - name: Setup .NET 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.x' - name: Restore tools run: dotnet tool restore - name: Restore dependencies diff --git a/Directory.Build.props b/Directory.Build.props index 9cb4e26fd..411219c43 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ true - true + false false true true diff --git a/global.json b/global.json index 2d85e8533..1f87612d1 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,6 @@ { "sdk": { - "version": "5.0.202" + "version": "6.0.416", + "rollForward": "patch" } } \ No newline at end of file diff --git a/src/FSharpLint.Core/Rules/Conventions/RaiseWithTooManyArguments/FailwithBadUsage.fs b/src/FSharpLint.Core/Rules/Conventions/RaiseWithTooManyArguments/FailwithBadUsage.fs index 555589712..23820f375 100644 --- a/src/FSharpLint.Core/Rules/Conventions/RaiseWithTooManyArguments/FailwithBadUsage.fs +++ b/src/FSharpLint.Core/Rules/Conventions/RaiseWithTooManyArguments/FailwithBadUsage.fs @@ -116,7 +116,7 @@ let private runner (args: AstNodeRuleParams) = | SynPat.Named (_, id, _, _, _) -> checkExpr app (Some id.idText) | _ -> checkExpr app None) | _ -> Array.empty - | _ -> Array.empty + // | _ -> Array.empty match args.AstNode with | AstNode.Expression expr -> checkExpr expr None diff --git a/tests/FSharpLint.Core.Tests/Rules/Conventions/CyclomaticComplexity.fs b/tests/FSharpLint.Core.Tests/Rules/Conventions/CyclomaticComplexity.fs index a0bab0f0d..b23f81936 100644 --- a/tests/FSharpLint.Core.Tests/Rules/Conventions/CyclomaticComplexity.fs +++ b/tests/FSharpLint.Core.Tests/Rules/Conventions/CyclomaticComplexity.fs @@ -229,7 +229,7 @@ let f() = let code = $"""Module Program let f() = let g() = -{(makeMatchSnippet (MaxComplexity+1)) |> indent 8} + {(makeMatchSnippet (MaxComplexity+1)) |> indent 8} let h() = {makeMatchSnippet MaxComplexity |> indent 8} {makeMatchSnippet (MaxComplexity+1) |> indent 4}"""