Skip to content

Commit 329340d

Browse files
Numpsyxperiandri
Numpsy
authored and
xperiandri
committed
Update Expecto to 10.2.3
And Expecto.FsCheck and the test adaptor to the matching versions.
1 parent 072588c commit 329340d

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎paket.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -871,16 +871,16 @@ NUGET
871871
Chessie (0.6)
872872
FSharp.Core (>= 4.0.1.7-alpha)
873873
NETStandard.Library (>= 1.6)
874-
Expecto (9.0.4)
875-
FSharp.Core (>= 4.6)
876-
Mono.Cecil (>= 0.11.3)
877-
Expecto.FsCheck (9.0.4)
878-
Expecto (>= 9.0.4)
879-
FsCheck (>= 2.14.3)
874+
Expecto (10.2.3)
875+
FSharp.Core (>= 7.0.200) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
876+
Mono.Cecil (>= 0.11.4 < 1.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
877+
Expecto.FsCheck (10.2.3)
878+
Expecto (>= 10.2.3) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
879+
FsCheck (>= 2.16.5 < 3.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
880880
FParsec (1.1.1)
881881
FSharp.Core (>= 4.3.4)
882882
System.ValueTuple (>= 4.4) - restriction: || (== net472) (&& (== net6.0) (>= net45)) (&& (== netcoreapp2.1) (>= net45)) (&& (== netstandard2.0) (>= net45))
883-
FsCheck (2.16.4)
883+
FsCheck (2.16.6)
884884
FSharp.Core (>= 4.2.3)
885885
FSharp.Compiler.Service (43.8.400)
886886
FSharp.Core (8.0.400)
@@ -981,7 +981,7 @@ NUGET
981981
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (== netcoreapp2.1) (== netstandard2.0)
982982
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netstandard1.0)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= wp8)) (== netstandard2.0)
983983
System.ValueTuple (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== netcoreapp2.1) (>= net462)) (&& (== netstandard2.0) (>= net462))
984-
YoloDev.Expecto.TestSdk (0.12.13)
985-
Expecto (>= 9.0 < 10.0) - restriction: || (&& (== net472) (>= netcoreapp2.1)) (== net6.0) (== netcoreapp2.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
986-
FSharp.Core (>= 4.6) - restriction: || (&& (== net472) (>= netcoreapp2.1)) (== net6.0) (== netcoreapp2.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
987-
System.Collections.Immutable (>= 1.5) - restriction: || (&& (== net472) (>= netcoreapp2.1)) (== net6.0) (== netcoreapp2.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
984+
YoloDev.Expecto.TestSdk (0.14.3)
985+
Expecto (>= 10.0 < 11.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
986+
FSharp.Core (>= 7.0.200) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
987+
System.Collections.Immutable (>= 6.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))

‎src/test/Fake.Core.CommandLine.UnitTests/Main.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ open System
88

99
[<EntryPoint>]
1010
let main argv =
11-
let config = defaultConfig |> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
1211

13-
Tests.runTestsInAssembly
14-
{ config with
15-
runInParallel = false
16-
parallelWorkers = 0
17-
printer = ExpectoHelpers.fakeDefaultPrinter
18-
verbosity = LogLevel.Debug }
12+
testFromThisAssembly ()
13+
|> Option.defaultValue (TestList([], Normal))
14+
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
15+
|> Tests.runTestsWithCLIArgs
16+
[| Tests.CLIArguments.Sequenced
17+
Tests.CLIArguments.Verbosity LogLevel.Debug
18+
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
1919
argv

‎src/test/Fake.Core.IntegrationTests/Main.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ open System
88

99
[<EntryPoint>]
1010
let main argv =
11-
let config = defaultConfig |> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
1211

13-
Tests.runTestsInAssembly
14-
{ config with
15-
runInParallel = false
16-
parallelWorkers = 0
17-
printer = ExpectoHelpers.fakeDefaultPrinter
18-
verbosity = LogLevel.Debug }
12+
testFromThisAssembly ()
13+
|> Option.defaultValue (TestList([], Normal))
14+
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
15+
|> Tests.runTestsWithCLIArgs
16+
[| Tests.CLIArguments.Sequenced
17+
Tests.CLIArguments.Verbosity LogLevel.Debug
18+
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
1919
argv

‎src/test/Fake.Core.UnitTests/Main.fs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ open Fake.ExpectoSupport
99

1010
[<EntryPoint>]
1111
let main argv =
12-
let config = defaultConfig |> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(30.))
1312

14-
Tests.runTestsInAssembly
15-
{ config with
16-
printer = ExpectoHelpers.fakeDefaultPrinter
17-
verbosity = LogLevel.Debug }
13+
testFromThisAssembly ()
14+
|> Option.defaultValue (TestList([], Normal))
15+
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
16+
|> Tests.runTestsWithCLIArgs
17+
[| Tests.CLIArguments.Verbosity LogLevel.Debug
18+
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
1819
argv

‎src/test/Fake.DotNet.Cli.IntegrationTests/Main.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ open System
88

99
[<EntryPoint>]
1010
let main argv =
11-
let config = defaultConfig |> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(30.))
1211

13-
Tests.runTestsInAssembly
14-
{ config with
15-
runInParallel = false
16-
parallelWorkers = 0
17-
printer = ExpectoHelpers.fakeDefaultPrinter
18-
verbosity = LogLevel.Debug }
12+
testFromThisAssembly ()
13+
|> Option.defaultValue (TestList([], Normal))
14+
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(30.))
15+
|> Tests.runTestsWithCLIArgs
16+
[| Tests.CLIArguments.Sequenced
17+
Tests.CLIArguments.Verbosity LogLevel.Debug
18+
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
1919
argv

‎src/test/Fake.ExpectoSupport/ExpectoHelpers.fs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,4 @@ module ExpectoHelpers =
146146
recMapping "" test
147147

148148

149-
let addTimeout t config =
150-
config |> addFilter (mapTest (withTimeout (t)))
149+
let addTimeout t test = test |> mapTest (withTimeout (t))

‎src/test/Fake.ExpectoSupport/Fake.ExpectoSupport.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)