Skip to content

Commit 493a981

Browse files
Re-enable F# analyzers in Library and Console templates (#310)
* Initial plan * Add F# analyzers to Library and Console templates Co-authored-by: TheAngryByrd <[email protected]> * Update fsharp-analyzers tool to version 0.29.0 in templates Co-authored-by: TheAngryByrd <[email protected]> * Update analyzer packages to latest versions - fsharp-analyzers to 0.33.1, Ionide.Analyzers to 0.14.9, G-Research.FSharp.Analyzers to 0.12.1 Co-authored-by: TheAngryByrd <[email protected]> * Correct G-Research.FSharp.Analyzers version from 0.12.1 to 0.19.0 (actual latest) Co-authored-by: TheAngryByrd <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: TheAngryByrd <[email protected]>
1 parent 5024e28 commit 493a981

File tree

8 files changed

+43
-2
lines changed

8 files changed

+43
-2
lines changed

Content/Console/.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.10.1",
12+
"version": "0.33.1",
1313
"commands": [
1414
"fsharp-analyzers"
1515
]

Content/Console/Directory.Packages.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,11 @@
4040
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="$(FakeVersion)" />
4141
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.441" />
4242
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
43+
44+
<!-- Analyzers -->
45+
<PackageVersion Include="FSharp.Analyzers.Build" Version="0.4.0" />
46+
<PackageVersion Include="Ionide.Analyzers" Version="0.14.9" />
47+
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.19.0" />
48+
4349
</ItemGroup>
4450
</Project>

Content/Console/src/Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,12 @@
5353
<NuGetAuditLevel>low</NuGetAuditLevel>
5454
<NuGetAudit>true</NuGetAudit>
5555
</PropertyGroup>
56+
57+
<ItemGroup>
58+
<!-- See Directory.Build.targets for FSharpAnalyzersOtherFlags -->
59+
<PackageReference Include="FSharp.Analyzers.Build" PrivateAssets="All"/>
60+
<PackageReference Include="Ionide.Analyzers" PrivateAssets="All"/>
61+
<PackageReference Include="G-Research.FSharp.Analyzers" PrivateAssets="All"/>
62+
</ItemGroup>
63+
5664
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
4+
<FSharpAnalyzersOtherFlags>--analyzers-path "$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs"</FSharpAnalyzersOtherFlags>
5+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path "$(PkgIonide_Analyzers)/analyzers/dotnet/fs"</FSharpAnalyzersOtherFlags>
6+
</PropertyGroup>
7+
</Project>

Content/Library/.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.11.0",
12+
"version": "0.33.1",
1313
"commands": [
1414
"fsharp-analyzers"
1515
]

Content/Library/Directory.Packages.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,11 @@
4040
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="$(FakeVersion)" />
4141
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.441" />
4242
<PackageVersion Include="Argu" Version="6.0" />
43+
44+
<!-- Analyzers -->
45+
<PackageVersion Include="FSharp.Analyzers.Build" Version="0.4.0" />
46+
<PackageVersion Include="Ionide.Analyzers" Version="0.14.9" />
47+
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.19.0" />
48+
4349
</ItemGroup>
4450
</Project>

Content/Library/src/Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,11 @@
6565
<NuGetAudit>true</NuGetAudit>
6666
</PropertyGroup>
6767

68+
<ItemGroup>
69+
<!-- See Directory.Build.targets for FSharpAnalyzersOtherFlags -->
70+
<PackageReference Include="FSharp.Analyzers.Build" PrivateAssets="All"/>
71+
<PackageReference Include="Ionide.Analyzers" PrivateAssets="All"/>
72+
<PackageReference Include="G-Research.FSharp.Analyzers" PrivateAssets="All"/>
73+
</ItemGroup>
74+
6875
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
4+
<FSharpAnalyzersOtherFlags>--analyzers-path "$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs"</FSharpAnalyzersOtherFlags>
5+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path "$(PkgIonide_Analyzers)/analyzers/dotnet/fs"</FSharpAnalyzersOtherFlags>
6+
</PropertyGroup>
7+
</Project>

0 commit comments

Comments
 (0)