File tree Expand file tree Collapse file tree 7 files changed +29
-25
lines changed
Expand file tree Collapse file tree 7 files changed +29
-25
lines changed Original file line number Diff line number Diff line change 99 ]
1010 },
1111 "fsharp-analyzers" : {
12- "version" : " 0.26.0 " ,
12+ "version" : " 0.32.1 " ,
1313 "commands" : [
1414 " fsharp-analyzers"
1515 ]
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -50,4 +50,4 @@ tests/FSharp.Literate.Tests/output2/
5050tests /FSharp.Literate.Tests /previous-next-output /
5151
5252# Analyzer
53- reports /
53+ analysis.sarif
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 " $(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs" </FSharpAnalyzersOtherFlags >
13+ <FSharpAnalyzersOtherFlags >$(FSharpAnalyzersOtherFlags) --analyzers-path " $(PkgIonide_Analyzers)/analyzers/dotnet/fs" </FSharpAnalyzersOtherFlags >
14+ <FSharpAnalyzersOtherFlags >$(FSharpAnalyzersOtherFlags) --exclude-analyzers PartialAppAnalyzer ReturnStructPartialActivePatternAnalyzer -c Release</FSharpAnalyzersOtherFlags >
15+ <FSharpAnalyzersOtherFlags >$(FSharpAnalyzersOtherFlags) --code-root $(CodeRoot)</FSharpAnalyzersOtherFlags >
16+ <FSharpAnalyzersOtherFlags >$(FSharpAnalyzersOtherFlags) --report " $(CodeRoot)/analysis.sarif" </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 " %(FullPath)" ', ' ')"
23+ ContinueOnError =" true"
24+ />
25+ </Target >
26+ </Project >
Original file line number Diff line number Diff line change 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 >
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments