Skip to content

Commit 92794cc

Browse files
committed
Update as much as possible -
Fake + AltCover updates cause an odd failure in coverage build
1 parent 25708b1 commit 92794cc

File tree

20 files changed

+228
-524
lines changed

20 files changed

+228
-524
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fetch-depth: 2
2020
- uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '8.0.100'
22+
dotnet-version: '9.0.304'
2323
- name: Tools
2424
run: dotnet tool restore
2525
- name: Setup
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@v5
4040
- uses: actions/setup-dotnet@v4
4141
with:
42-
dotnet-version: '7.0.400'
42+
dotnet-version: '9.0.304'
4343
- name: Tools
4444
run: dotnet tool restore
4545
- name: Setup

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: 14 additions & 15 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
@@ -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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.0.0" />
1212
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
1313
<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" />
14+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
15+
<PackageVersion Include="Expecto" Version="10.2.3" />
1616
<PackageVersion Include="Expecto.FsCheck" Version="9.0.4" />
1717
<PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
1818
<PackageVersion Include="FAKE.Core.Environment" Version="6.0.0" />
@@ -31,21 +31,21 @@
3131
<PackageVersion Include="FAKE.Tools.Git" Version="6.0.0" />
3232
<PackageVersion Include="FAKE.Testing.ReportGenerator" Version="6.0.0" />
3333
<PackageVersion Include="FsCheck" Version="2.16.5" />
34-
<PackageVersion Include="FSharp.Core" Version="8.0.100" />
34+
<PackageVersion Include="FSharp.Core" Version="9.0.303" />
3535
<PackageVersion Include="FsUnit" Version="5.1.0" />
3636
<!-- 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" />
37+
<PackageVersion Include="Markdig" Version="0.41.3" />
38+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3939
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
4040
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="16.0.0" />
4141
<PackageVersion Include="Mono.Cecil" Version="0.11.4" />
4242
<PackageVersion Include="Mono.Options" Version="6.12.0.148" />
4343
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
4444
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
4545
<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" />
46+
<PackageVersion Include="NuGet.CommandLine" Version="6.14.0" />
47+
<PackageVersion Include="NUnit" Version="4.4.0" />
48+
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
4949
<!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
5050
<PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" Version="3.12.0" />
5151
<!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
@@ -62,7 +62,7 @@
6262
<PackageVersion Include="xunit" Version="2.4.2" />
6363
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
6464
<PackageVersion Include="xunit.analyzers" Version="1.0.0" />
65-
<PackageVersion Include="xunit.assert" Version="2.6.5" />
65+
<PackageVersion Include="xunit.assert" Version="2.9.3" />
6666
<PackageVersion Include="xunit.core" Version="2.4.2" />
6767
<PackageVersion Include="xunit.extensibility.core" Version="2.4.2" />
6868
<PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />

FakeForAltCodeTestBuild.sln

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

FakeForAltCodeTestBuild.slnx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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/build-rules.xml" />
6+
<File Path="Build/Directory.Build.props" />
7+
<File Path="Directory.Build.props" />
8+
<File Path="Directory.Build.targets" />
9+
<File Path="Directory.Packages.props" />
10+
<File Path="global.json" />
11+
<File Path="OutputBuildProps.props" />
12+
<File Path="OutputBuildTargets.props" />
13+
<File Path="ReleaseNotes.md" />
14+
</Folder>
15+
<Project Path="Build/Build.fsproj" />
16+
<Project Path="Build/Setup.fsproj" />
17+
</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)