Skip to content

Commit 61d6c02

Browse files
committed
Run analyzers for all projects
1 parent 2bd545e commit 61d6c02

File tree

7 files changed

+29
-25
lines changed

7 files changed

+29
-25
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"fsharp-analyzers": {
12-
"version": "0.26.0",
12+
"version": "0.32.1",
1313
"commands": [
1414
"fsharp-analyzers"
1515
]

.github/workflows/pull-requests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
uses: github/codeql-action/upload-sarif@v3
3535
if: matrix.os == 'ubuntu-latest'
3636
with:
37-
sarif_file: ./reports
37+
sarif_file: ./analysis.sarif

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ tests/FSharp.Literate.Tests/output2/
5050
tests/FSharp.Literate.Tests/previous-next-output/
5151

5252
# Analyzer
53-
reports/
53+
analysis.sarif

Directory.Packages.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
2727
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2828
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
29-
<PackageVersion Include="FSharp.Analyzers.Build" Version="0.3.0" />
30-
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.10.0" />
31-
<PackageVersion Include="Ionide.Analyzers" Version="0.11.0" />
29+
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.18.0" />
30+
<PackageVersion Include="Ionide.Analyzers" Version="0.14.7" />
3231
</ItemGroup>
3332
</Project>

Directory.Solution.targets

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
<Project>
2-
<ItemGroup>
3-
<ProjectsToAnalyze Include="src/**/*.fsproj" />
4-
</ItemGroup>
2+
<!-- Import the NuGet props file to get access to Pkg* variables -->
3+
<Import Project="src/FSharp.Formatting/obj/FSharp.Formatting.fsproj.nuget.g.props" Condition="Exists('src/FSharp.Formatting/obj/FSharp.Formatting.fsproj.nuget.g.props')" />
54

6-
<Target Name="AnalyzeSolution">
7-
<MSBuild Projects="@(ProjectsToAnalyze)" Targets="AnalyzeFSharpProject" />
8-
</Target>
9-
</Project>
5+
<ItemGroup>
6+
<ProjectsToAnalyze Include="src/**/*.fsproj" />
7+
</ItemGroup>
8+
9+
<Target Name="AnalyzeSolution" Condition="Exists('src/FSharp.Formatting/obj/FSharp.Formatting.fsproj.nuget.g.props')">
10+
<PropertyGroup>
11+
<CodeRoot>$(SolutionDir)</CodeRoot>
12+
<FSharpAnalyzersOtherFlags>--analyzers-path &quot;$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
13+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path &quot;$(PkgIonide_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
14+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --exclude-analyzers PartialAppAnalyzer ReturnStructPartialActivePatternAnalyzer -c Release</FSharpAnalyzersOtherFlags>
15+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --code-root $(CodeRoot)</FSharpAnalyzersOtherFlags>
16+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --report &quot;$(CodeRoot)/analysis.sarif&quot;</FSharpAnalyzersOtherFlags>
17+
</PropertyGroup>
18+
<Delete Files="$(SolutionDir)/analysis.sarif" Condition="Exists('$(SolutionDir)/analysis.sarif')" />
19+
20+
<!-- Execute fsharp-analyzers with all projects in a single process -->
21+
<Exec
22+
Command="dotnet fsharp-analyzers $(FSharpAnalyzersOtherFlags) @(ProjectsToAnalyze->'--project &quot;%(FullPath)&quot;', ' ')"
23+
ContinueOnError="true"
24+
/>
25+
</Target>
26+
</Project>

src/Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<Project>
22
<Import Project="../Directory.Build.props" />
33
<ItemGroup>
4-
<PackageReference Include="FSharp.Analyzers.Build">
5-
<PrivateAssets>all</PrivateAssets>
6-
<IncludeAssets>build</IncludeAssets>
7-
</PackageReference>
84
<PackageReference Include="G-Research.FSharp.Analyzers">
95
<PrivateAssets>all</PrivateAssets>
106
<IncludeAssets>analyzers</IncludeAssets>

src/Directory.Build.targets

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)