Skip to content

Commit e8621a2

Browse files
SteveGilhamSteveGilham
authored
Bump actions/checkout from 4 to 5
And a bunch of Code Rabbit review tweaks
2 parents 71b8475 + 1cd57b5 commit e8621a2

File tree

21 files changed

+261
-588
lines changed

21 files changed

+261
-588
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-reportgenerator-globaltool": {
6-
"version": "5.2.0",
6+
"version": "5.4.12",
77
"commands": [
88
"reportgenerator"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"dotnet-fsharplint": {
12-
"version": "0.23.6",
13+
"version": "0.26.2",
1314
"commands": [
1415
"dotnet-fsharplint"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"coveralls.net": {
1820
"version": "4.0.1",
1921
"commands": [
2022
"csmacnz.Coveralls"
21-
]
23+
],
24+
"rollForward": false
2225
}
2326
}
2427
}

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
windows:
1515
runs-on: windows-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5.0.0
1818
with:
1919
fetch-depth: 2
2020
- uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '8.0.100'
22+
global-json-file: global.json
2323
- name: Tools
2424
run: dotnet tool restore
2525
- name: Setup
@@ -36,10 +36,12 @@ jobs:
3636
linux:
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/[email protected]
40+
with:
41+
fetch-depth: 2
4042
- uses: actions/setup-dotnet@v4
4143
with:
42-
dotnet-version: '7.0.400'
44+
global-json-file: global.json
4345
- name: Tools
4446
run: dotnet tool restore
4547
- name: Setup

‎Build/Build.fsproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
<PackageReference Include="Fake.Core.Process" />
1818
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
1919
<PackageReference Include="Fake.DotNet.Cli" />
20-
<PackageReference Include="Fake.DotNet.FxCop" />
2120
<PackageReference Include="Fake.DotNet.MSBuild" />
2221
<PackageReference Include="Fake.DotNet.NuGet" />
2322
<PackageReference Include="Fake.DotNet.Testing.NUnit" />
24-
<PackageReference Include="Fake.DotNet.Testing.OpenCover" />
2523
<PackageReference Include="Fake.DotNet.Testing.XUnit2" />
2624
<PackageReference Include="Fake.IO.FileSystem" />
2725
<PackageReference Include="Fake.Tools.Git" />
@@ -31,5 +29,4 @@
3129
<PackageReference Include="Markdig" />
3230
<PackageReference Include="NUnit" />
3331
</ItemGroup>
34-
35-
</Project>
32+
</Project>

‎Build/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<AltCodeTag>$</AltCodeTag>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77
<Import Project="$(MSBuildThisFileDirectory)\..\Directory.Build.props" />
88
</Project>

‎Build/actions.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ module Actions =
1515
let Clean () =
1616
let rec clean1 depth =
1717
try
18-
(DirectoryInfo ".")
19-
.GetDirectories("*", SearchOption.AllDirectories)
18+
(DirectoryInfo ".").GetDirectories("*", SearchOption.AllDirectories)
2019
|> Seq.filter (fun x ->
2120
x.Name.StartsWith "_"
2221
|| x.Name = "bin"

‎Build/targets.fs‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,7 @@ module Targets =
195195
+ commitHash
196196
+ Environment.NewLine
197197
+ Environment.NewLine
198-
+ w
199-
.ToString()
200-
.Replace("\u204B", Environment.NewLine)
198+
+ w.ToString().Replace("\u204B", Environment.NewLine)
201199

202200
printfn "release notes are %A characters" releaseNotes.Length
203201
Assert.That(releaseNotes.Length, Is.LessThan 35000)
@@ -350,15 +348,15 @@ module Targets =
350348
let BuildRelease =
351349
(fun _ ->
352350
try
353-
"./altcode.test/altcode.test.sln"
351+
"./altcode.test/altcode.test.slnx"
354352
|> dotnetBuildRelease
355353
with x ->
356354
printfn "%A" x
357355
reraise ())
358356

359357
let BuildDebug =
360358
(fun _ ->
361-
"./altcode.test/altcode.test.sln"
359+
"./altcode.test/altcode.test.slnx"
362360
|> dotnetBuildDebug)
363361

364362
let Validation =
@@ -368,7 +366,7 @@ module Targets =
368366
{ p.WithCommon dotnetOptions with
369367
MSBuildParams = cliArguments
370368
Configuration = DotNet.BuildConfiguration.Debug
371-
Framework = Some "net7.0"
369+
Framework = Some "net8.0"
372370
NoBuild = true })
373371
"./altcode.test/validation")
374372

@@ -419,6 +417,7 @@ module Targets =
419417
(fun to' ->
420418
{ to'.WithCommon(setBaseOptions) with
421419
MSBuildParams = cliArguments
420+
Framework = Some "net8.0"
422421
NoBuild = true }
423422
.WithAltCoverOptions
424423
prepare
@@ -427,7 +426,7 @@ module Targets =
427426
test
428427
with x ->
429428
printfn "%A" x
430-
// reraise()) // while fixing
429+
reraise () // argue either way
431430

432431
altReport :: l)
433432
[]
@@ -489,7 +488,11 @@ module Targets =
489488
|> (fun u ->
490489
u |> (printfn "%A uncovered lines")
491490
// printfn "%A" (u.GetType().FullName)
492-
Assert.That(u, Is.EqualTo [ 0 ], "All lines should be covered")))
491+
Assert.That<int list>(
492+
u,
493+
Is.EqualTo<int list> [ 0 ],
494+
"All lines should be covered"
495+
)))
493496

494497
// Code Analysis
495498

@@ -513,9 +516,8 @@ module Targets =
513516
let failOnIssuesFound (issuesFound: bool) =
514517
Assert.That(issuesFound, Is.False, "Lint issues were found")
515518

516-
[ !! "./**/*.fsproj"
517-
|> Seq.sortBy (Path.GetFileName)
518-
!! "./Build/*.fsx" |> Seq.map Path.GetFullPath ]
519+
[ !!"./**/*.fsproj" |> Seq.sortBy (Path.GetFileName)
520+
!!"./Build/*.fsx" |> Seq.map Path.GetFullPath ]
519521
|> Seq.concat
520522
|> Seq.map doLintAsync
521523
|> throttle
@@ -544,10 +546,7 @@ module Targets =
544546
Directory.ensure "./_Binaries"
545547

546548
Actions.PrepareReadMe(
547-
(Copyright)
548-
.Replace("©", "&#xa9;")
549-
.Replace("<", "&lt;")
550-
.Replace(">", "&gt;")
549+
(Copyright).Replace("©", "&#xa9;").Replace("<", "&lt;").Replace(">", "&gt;")
551550
))
552551

553552
//let Deployment ignore
@@ -563,7 +562,7 @@ module Targets =
563562
|> String.IsNullOrWhiteSpace
564563
|> not
565564
then
566-
(!! "./_Packagin*/*.nupkg")
565+
(!!"./_Packagin*/*.nupkg")
567566
|> Seq.iter (fun f ->
568567
printfn "Publishing %A from %A" f currentBranch
569568

‎Directory.Packages.props‎

Lines changed: 21 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<PackageVersion Include="AltCode.Dixon" Version="2022.1.8.13182" />
5-
<PackageVersion Include="altcode.gendarme" Version="2022.12.6.7345" />
64
<PackageVersion Include="altcover" Version="8.6.125" />
7-
<PackageVersion Include="AltCover.Api" Version="8.6.68" />
85
<PackageVersion Include="AltCover.Fake" Version="8.6.125" />
6+
<PackageVersion Include="Expecto" Version="10.2.3" />
97
<PackageVersion Include="BlackFox.CommandLine" Version="1.0.0" />
108
<PackageVersion Include="BlackFox.VsWhere" Version="1.1.0" />
11-
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.0.0" />
12-
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
13-
<PackageVersion Include="CsvTextFieldParser" Version="1.2.2-preview" />
14-
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
15-
<PackageVersion Include="Expecto" Version="10.1.0" />
16-
<PackageVersion Include="Expecto.FsCheck" Version="9.0.4" />
17-
<PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
18-
<PackageVersion Include="FAKE.Core.Environment" Version="6.0.0" />
19-
<PackageVersion Include="FAKE.Core.Process" Version="6.0.0" />
20-
<PackageVersion Include="FAKE.Core.Target" Version="6.0.0" />
21-
<PackageVersion Include="FAKE.Core.Trace" Version="5.23.1" />
22-
<PackageVersion Include="FAKE.DotNet.AssemblyInfoFile" Version="6.0.0" />
23-
<PackageVersion Include="FAKE.DotNet.Cli" Version="6.0.0" />
24-
<PackageVersion Include="FAKE.DotNet.FxCop" Version="6.0.0" />
25-
<PackageVersion Include="FAKE.DotNet.MSBuild" Version="6.0.0" />
26-
<PackageVersion Include="FAKE.DotNet.Nuget" Version="6.0.0" />
27-
<PackageVersion Include="FAKE.DotNet.Testing.NUnit" Version="6.0.0" />
28-
<PackageVersion Include="FAKE.DotNet.Testing.OpenCover" Version="6.0.0" />
29-
<PackageVersion Include="FAKE.DotNet.Testing.XUnit2" Version="6.0.0" />
30-
<PackageVersion Include="FAKE.IO.FileSystem" Version="6.0.0" />
31-
<PackageVersion Include="FAKE.Tools.Git" Version="6.0.0" />
32-
<PackageVersion Include="FAKE.Testing.ReportGenerator" Version="6.0.0" />
33-
<PackageVersion Include="FsCheck" Version="2.16.5" />
34-
<PackageVersion Include="FSharp.Core" Version="8.0.100" />
35-
<PackageVersion Include="FsUnit" Version="5.1.0" />
36-
<!-- PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" / -->
37-
<PackageVersion Include="Markdig" Version="0.34.0" />
38-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
39-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
40-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="16.0.0" />
41-
<PackageVersion Include="Mono.Cecil" Version="0.11.4" />
42-
<PackageVersion Include="Mono.Options" Version="6.12.0.148" />
43-
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
44-
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
45-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
46-
<PackageVersion Include="NuGet.CommandLine" Version="6.8.0" />
47-
<PackageVersion Include="NUnit" Version="4.0.1" />
48-
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
49-
<!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
50-
<PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" Version="3.12.0" />
51-
<!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
52-
<PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.16.0" />
53-
<PackageVersion Include="OpenCover" Version="4.7.1221" />
54-
<PackageVersion Include="Pester" Version="5.3.3" />
55-
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
56-
<PackageVersion Include="System.Collections.Immutable" Version="5.0.0" />
57-
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
58-
<PackageVersion Include="System.Reactive.Core" Version="5.0.0" />
59-
<PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
60-
<PackageVersion Include="Unquote" Version="6.1.0" />
61-
<PackageVersion Include="XmlDoc2CmdletDoc" Version="0.4.0-dotnetcore0001" />
62-
<PackageVersion Include="xunit" Version="2.4.2" />
63-
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
64-
<PackageVersion Include="xunit.analyzers" Version="1.0.0" />
65-
<PackageVersion Include="xunit.assert" Version="2.6.5" />
66-
<PackageVersion Include="xunit.core" Version="2.4.2" />
67-
<PackageVersion Include="xunit.extensibility.core" Version="2.4.2" />
68-
<PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />
69-
<PackageVersion Include="xunit.runner.console" Version="2.4.2" />
70-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
71-
<PackageVersion Include="YamlDotNet" Version="12.0.2" />
72-
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="1.0.0" />
9+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
10+
<PackageVersion Include="Fake.Core.Environment" Version="6.0.0" />
11+
<PackageVersion Include="Fake.Core.Process" Version="6.0.0" />
12+
<PackageVersion Include="Fake.Core.Target" Version="6.0.0" />
13+
<PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="6.0.0" />
14+
<PackageVersion Include="Fake.DotNet.Cli" Version="6.0.0" />
15+
<PackageVersion Include="Fake.DotNet.MSBuild" Version="6.0.0" />
16+
<PackageVersion Include="Fake.DotNet.Nuget" Version="6.0.0" />
17+
<PackageVersion Include="Fake.DotNet.Testing.NUnit" Version="6.0.0" />
18+
<PackageVersion Include="Fake.DotNet.Testing.XUnit2" Version="6.0.0" />
19+
<PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
20+
<PackageVersion Include="Fake.Testing.ReportGenerator" Version="6.0.0" />
21+
<PackageVersion Include="Fake.Tools.Git" Version="6.0.0" />
22+
<PackageVersion Include="FSharp.Core" Version="9.0.303" />
23+
<PackageVersion Include="Markdig" Version="0.41.3" />
24+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
25+
<PackageVersion Include="NUnit" Version="4.4.0" />
26+
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
27+
<PackageVersion Include="NuGet.CommandLine" Version="6.14.0" />
28+
<PackageVersion Include="xunit.assert" Version="2.9.3" />
7329
</ItemGroup>
7430
</Project>

‎FakeForAltCodeTestBuild.sln‎

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

‎FakeForAltCodeTestBuild.slnx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path=".config/dotnet-tools.json" />
4+
<File Path=".github/workflows/main.yml" />
5+
<File Path="Build/Directory.Build.props" />
6+
<File Path="Build/rules-fake.xml" />
7+
<File Path="Directory.Build.props" />
8+
<File Path="Directory.Build.targets" />
9+
<File Path="Directory.Packages.props" />
10+
<File Path="fullbuild.ps1" />
11+
<File Path="global.json" />
12+
<File Path="OutputBuildProps.props" />
13+
<File Path="OutputBuildTargets.props" />
14+
<File Path="ReleaseNotes.md" />
15+
</Folder>
16+
<Project Path="Build/Build.fsproj" />
17+
<Project Path="Build/Setup.fsproj" />
18+
</Solution>

‎altcode.test/altcode.test.expecto/Expecto.fs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,12 @@ module AltFlipExpect =
153153
type AltCSharpExpect() =
154154

155155
static member public IsFasterThan
156-
(
157-
(x: AssertionMatch<Func<'a>>),
158-
message: string,
159-
[<Out>] result: string byref
160-
) =
156+
((x: AssertionMatch<Func<'a>>), message: string, [<Out>] result: string byref)
157+
=
161158
Expecto.CSharp.Function.IsFasterThan(x.Actual, x.Expected, message, &result)
162159

163160
static member public IsFasterThan
164-
(
165-
(x: AssertionMatch<Action * Func<'a>>),
166-
message: string,
167-
[<Out>] result: string byref
168-
) =
161+
((x: AssertionMatch<Action * Func<'a>>), message: string, [<Out>] result: string byref) =
169162
Expecto.CSharp.Function.IsFasterThan(
170163
fst x.Actual,
171164
snd x.Actual,

0 commit comments

Comments
 (0)