Skip to content

Commit 5410314

Browse files
nojafnojaf
authored
Merge branch 'main' into dotnet-8-sdk
2 parents 2f0816c + f51f916 commit 5410314

File tree

117 files changed

+1329
-10415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1329
-10415
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"fsharp-analyzers": {
24-
"version": "0.17.1",
24+
"version": "0.20.2",
2525
"commands": [
2626
"fsharp-analyzers"
2727
]

‎Directory.Build.props‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,14 @@ Some common use cases include:
6161
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="all" />
6262
</ItemGroup>
6363
<ItemGroup>
64-
<PackageReference Include="G-Research.FSharp.Analyzers" Version="0.1.6">
65-
<PrivateAssets>all</PrivateAssets>
66-
<IncludeAssets>build</IncludeAssets>
64+
<PackageReference Include="G-Research.FSharp.Analyzers" Version="0.3.1">
65+
<PrivateAssets>all</PrivateAssets>
66+
<IncludeAssets>build</IncludeAssets>
6767
</PackageReference>
68+
<PackageReference Include="Ionide.Analyzers" Version="0.4.0">
69+
<PrivateAssets>all</PrivateAssets>
70+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
71+
</PackageReference>
72+
<PackageReference Include="FSharp.Analyzers.Build" Version="0.2.0" PrivateAssets="All" />
6873
</ItemGroup>
6974
</Project>

‎Directory.Build.targets‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
<Project>
2-
3-
<Target
4-
Name="AnalyzeProject"
5-
DependsOnTargets="Restore;ResolveAssemblyReferencesDesignTime;ResolveProjectReferencesDesignTime;ResolvePackageDependenciesDesignTime;FindReferenceAssembliesForReferences;_GenerateCompileDependencyCache;_ComputeNonExistentFileProperty;BeforeBuild;BeforeCompile;CoreCompile">
6-
7-
<Message Importance="normal" Text="fsc arguments: @(FscCommandLineArgs)" />
8-
<Message Importance="High" Text="Analyzing $(MSBuildProjectFile)"/>
9-
<PropertyGroup>
10-
<DOTNET_ROLL_FORWARD_TO_PRERELEASE>1</DOTNET_ROLL_FORWARD_TO_PRERELEASE>
11-
<DOTNET_ROLL_FORWARD>LatestMajor</DOTNET_ROLL_FORWARD>
12-
</PropertyGroup>
13-
<Exec
14-
ContinueOnError="true"
15-
Command="dotnet fsharp-analyzers --fsc-args &quot;@(FscCommandLineArgs)&quot; --analyzers-path &quot;$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs&quot; --exclude-analyzer PartialAppAnalyzer --fail-on-warnings GRA-STRING-001 GRA-STRING-002 GRA-STRING-003 GRA-UNIONCASE-001 --verbose --report &quot;../../analysisreports/$(MSBuildProjectName)-analysis.sarif&quot;">
16-
<Output TaskParameter="ExitCode" PropertyName="LastExitCode" />
17-
</Exec>
18-
<Error Condition="'$(LastExitCode)' == '-2'" Text="Problems were found $(MSBuildProjectFile)" />
19-
20-
</Target>
21-
2+
<PropertyGroup>
3+
<CodeRoot Condition="$(CodeRoot) == ''">.</CodeRoot>
4+
<FSharpAnalyzersOtherFlags>--analyzers-path &quot;$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
5+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path &quot;$(PkgIonide_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
6+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --exclude-analyzer PartialAppAnalyzer</FSharpAnalyzersOtherFlags>
7+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --treat-as-warning GRA-STRING-001 GRA-STRING-002 GRA-STRING-003 GRA-UNIONCASE-001 IONIDE-001 IONIDE-002 IONIDE-003 IONIDE-004 IONIDE-005</FSharpAnalyzersOtherFlags>
8+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --verbose</FSharpAnalyzersOtherFlags>
9+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --code-root $(CodeRoot)</FSharpAnalyzersOtherFlags>
10+
<FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --report &quot;$(CodeRoot)/analysisreports/$(MSBuildProjectName)-analysis.sarif&quot;</FSharpAnalyzersOtherFlags>
11+
</PropertyGroup>
2212
</Project>

‎Directory.Solution.targets‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<Project>
22

33
<ItemGroup>
4-
<ProjectsToAnalyze Include="src\**\*.fsproj" Exclude="src\Fantomas.FCS\Fantomas.FCS.fsproj"/>
4+
<ProjectsToAnalyze Include="src/**/*.fsproj" Exclude="src/Fantomas.FCS/Fantomas.FCS.fsproj"/>
55
</ItemGroup>
66

77
<Target Name="AnalyzeSolution">
8-
<Exec Command="dotnet build -c Release $(SolutionFileName)" />
9-
<MSBuild
10-
Projects="@(ProjectsToAnalyze)"
11-
Targets="AnalyzeProject"
12-
Properties="DesignTimeBuild=True;Configuration=Release;ProvideCommandLineArgs=True;SkipCompilerExecution=True" />
8+
<PropertyGroup>
9+
<CodeRoot>$(SolutionDir)</CodeRoot>
10+
</PropertyGroup>
11+
<RemoveDir Directories="$(SolutionDir)/analysisreports" />
12+
<MSBuild Projects="@(ProjectsToAnalyze)"
13+
Targets="AnalyzeFSharpProject"
14+
Properties="CodeRoot=$(CodeRoot)" ContinueOnError="true" />
1315
</Target>
1416

1517
</Project>

‎build.fsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ pipeline "Build" {
6969
stage "Pack" { run "dotnet pack --no-restore -c Release" }
7070
stage "Docs" {
7171
whenNot { platformOSX }
72-
run "dotnet fsi ./docs/.style/style.fsx"
7372
envVars
7473
[| "DOTNET_ROLL_FORWARD_TO_PRERELEASE", "1"
7574
"DOTNET_ROLL_FORWARD", "LatestMajor" |]
@@ -166,11 +165,9 @@ pipeline "Docs" {
166165
run "dotnet build -c Release src/Fantomas/Fantomas.fsproj"
167166
}
168167
stage "Watch" {
169-
paralle
170168
envVars
171169
[| "DOTNET_ROLL_FORWARD_TO_PRERELEASE", "1"
172170
"DOTNET_ROLL_FORWARD", "LatestMajor" |]
173-
run "dotnet fsi ./docs/.style/style.fsx --watch"
174171
run
175172
$"dotnet fsdocs watch --properties Configuration=Release --fscoptions \" -r:{semanticVersioning}\" --eval --nonpublic"
176173
}

‎docs/.style/bootstrap/scss/_accordion.scss‎

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

‎docs/.style/bootstrap/scss/_alert.scss‎

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

‎docs/.style/bootstrap/scss/_badge.scss‎

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

0 commit comments

Comments
 (0)