Skip to content

Commit 1cd57b5

Browse files
committed
Address yet more review comments
1 parent f9f647e commit 1cd57b5

File tree

7 files changed

+26
-10
lines changed

7 files changed

+26
-10
lines changed

.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@v5
17+
- uses: actions/checkout@v5.0.0
1818
with:
1919
fetch-depth: 2
2020
- uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '9.0.304'
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@v5
39+
- uses: actions/[email protected]
40+
with:
41+
fetch-depth: 2
4042
- uses: actions/setup-dotnet@v4
4143
with:
42-
dotnet-version: '9.0.304'
44+
global-json-file: global.json
4345
- name: Tools
4446
run: dotnet tool restore
4547
- name: Setup

Build/targets.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ module Targets =
426426
test
427427
with x ->
428428
printfn "%A" x
429-
// reraise()) // while fixing
429+
reraise () // argue either way
430430

431431
altReport :: l)
432432
[]

FakeForAltCodeTestBuild.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<File Path="Directory.Build.props" />
88
<File Path="Directory.Build.targets" />
99
<File Path="Directory.Packages.props" />
10+
<File Path="fullbuild.ps1" />
1011
<File Path="global.json" />
1112
<File Path="OutputBuildProps.props" />
1213
<File Path="OutputBuildTargets.props" />

altcode.test/altcode.test.nunit/NUnit.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type AltAssert =
3838
Assert.That(
3939
x.Actual,
4040
Is.EqualTo(x.Expected).Within(delta),
41-
String.Format(message, args)
41+
AltAssertBase.ConvertMessageWithArgs(message, args)
4242
)
4343

4444
static member AreEqual(x: AssertionMatch<double>, delta) =

altcode.test/altcode.test.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<File Path="../Build/targets.fs" />
1010
<File Path="../Directory.Packages.props" />
1111
<File Path="../fsharplint.json" />
12+
<File Path="../fullbuild.ps1" />
1213
<File Path="../global.json" />
1314
<File Path="../README.md" />
1415
<File Path="../ReleaseNotes.md" />

altcode.test/altcode.test.xunit/XUnit.fs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,20 @@ type AltAssert =
9292
static member NotEqual
9393
(x: AssertionMatch<#IEnumerable<'a>>, comparer: Func<'a, 'a, bool>)
9494
=
95-
Assert.NotEqual<'a>(x.Expected :> IEnumerable<'a>, x.Actual :> IEnumerable<'a>, comparer)
95+
Assert.NotEqual<'a>(
96+
x.Expected :> IEnumerable<'a>,
97+
x.Actual :> IEnumerable<'a>,
98+
comparer
99+
)
96100

97101
static member NotEqual
98102
(x: AssertionMatch<#IEnumerable<'a>>, comparer: IEqualityComparer<'a>)
99103
=
100-
Assert.NotEqual<'a>(x.Expected :> IEnumerable<'a>, x.Actual :> IEnumerable<'a>, comparer)
104+
Assert.NotEqual<'a>(
105+
x.Expected :> IEnumerable<'a>,
106+
x.Actual :> IEnumerable<'a>,
107+
comparer
108+
)
101109

102110
static member NotEqual<'a>(x: AssertionMatch<'a>) =
103111
Assert.NotEqual<'a>(x.Expected, x.Actual)

fullbuild.ps1

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Set-StrictMode -Version Latest
2+
$ErrorActionPreference = 'Stop'
3+
Set-Location -Path $PSScriptRoot
4+
15
dotnet tool restore
2-
dotnet run --project .\Build\Setup.fsproj
3-
dotnet run --project .\Build\Build.fsproj
6+
dotnet run --project (Join-Path $PSScriptRoot 'Build/Setup.fsproj')
7+
dotnet run --project (Join-Path $PSScriptRoot 'Build/Build.fsproj')

0 commit comments

Comments
 (0)