Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Numpsy why not upgrade from v5 to v6 everywhere? (specifically, am wondering why you left 5.0.x in L15)

- name: Restore tools
run: dotnet tool restore
- name: Restore dependencies
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0">
<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
<MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors>
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

disabled this for now, as there are warnings about .NET 5 being unsupported

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but isn't this PR upgrading from v5 to v6? then this warning should be gone in this PR

<IsPackable>false</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
Expand Down
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"sdk": {
"version": "5.0.202"
"version": "6.0.416",
"rollForward": "patch"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newer sdks have this warning here

FSharpLint\src\FSharpLint.Core\Rules\Conventions\RaiseWithTooManyArguments\FailwithBadUsage.fs(119,11): error FS0026: This rule will never be matched

(which cause a build failure due to WarningsAsErrors being enabled)


match args.AstNode with
| AstNode.Expression expr -> checkExpr expr None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ let f() =
let code = $"""Module Program
let f() =
let g() =
{(makeMatchSnippet (MaxComplexity+1)) |> indent 8}
{(makeMatchSnippet (MaxComplexity+1)) |> indent 8}
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newer SDKs have this warning here

FSharpLint\tests\FSharpLint.Core.Tests\Rules\Conventions\CyclomaticComplexity.fs(232,3): error FS0058: Possible incorrect indentation: this token is offside of context started at position (229:9). Try indenting this token further or using standard formatting conventions.

let h() =
{makeMatchSnippet MaxComplexity |> indent 8}
{makeMatchSnippet (MaxComplexity+1) |> indent 4}"""
Expand Down