Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -871,16 +871,16 @@ NUGET
Chessie (0.6)
FSharp.Core (>= 4.0.1.7-alpha)
NETStandard.Library (>= 1.6)
Expecto (9.0.4)
FSharp.Core (>= 4.6)
Mono.Cecil (>= 0.11.3)
Expecto.FsCheck (9.0.4)
Expecto (>= 9.0.4)
FsCheck (>= 2.14.3)
Expecto (10.2.3)
FSharp.Core (>= 7.0.200) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
Mono.Cecil (>= 0.11.4 < 1.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
Expecto.FsCheck (10.2.3)
Expecto (>= 10.2.3) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
FsCheck (>= 2.16.5 < 3.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
FParsec (1.1.1)
FSharp.Core (>= 4.3.4)
System.ValueTuple (>= 4.4) - restriction: || (== net472) (&& (== net6.0) (>= net45)) (&& (== netcoreapp2.1) (>= net45)) (&& (== netstandard2.0) (>= net45))
FsCheck (2.16.4)
FsCheck (2.16.6)
FSharp.Core (>= 4.2.3)
FSharp.Compiler.Service (43.8.400)
FSharp.Core (8.0.400)
Expand Down Expand Up @@ -981,7 +981,7 @@ NUGET
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (== netcoreapp2.1) (== netstandard2.0)
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)
System.ValueTuple (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== netcoreapp2.1) (>= net462)) (&& (== netstandard2.0) (>= net462))
YoloDev.Expecto.TestSdk (0.12.13)
Expecto (>= 9.0 < 10.0) - restriction: || (&& (== net472) (>= netcoreapp2.1)) (== net6.0) (== netcoreapp2.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
FSharp.Core (>= 4.6) - restriction: || (&& (== net472) (>= netcoreapp2.1)) (== net6.0) (== netcoreapp2.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
System.Collections.Immutable (>= 1.5) - restriction: || (&& (== net472) (>= netcoreapp2.1)) (== net6.0) (== netcoreapp2.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
YoloDev.Expecto.TestSdk (0.14.3)
Expecto (>= 10.0 < 11.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
FSharp.Core (>= 7.0.200) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
System.Collections.Immutable (>= 6.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (&& (== netcoreapp2.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0))
14 changes: 7 additions & 7 deletions src/test/Fake.Core.CommandLine.UnitTests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ open System

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

Tests.runTestsInAssembly
{ config with
runInParallel = false
parallelWorkers = 0
printer = ExpectoHelpers.fakeDefaultPrinter
verbosity = LogLevel.Debug }
testFromThisAssembly ()
|> Option.defaultValue (TestList([], Normal))
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
|> Tests.runTestsWithCLIArgs
[| Tests.CLIArguments.Sequenced
Tests.CLIArguments.Verbosity LogLevel.Debug
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
argv
14 changes: 7 additions & 7 deletions src/test/Fake.Core.IntegrationTests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ open System

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

Tests.runTestsInAssembly
{ config with
runInParallel = false
parallelWorkers = 0
printer = ExpectoHelpers.fakeDefaultPrinter
verbosity = LogLevel.Debug }
testFromThisAssembly ()
|> Option.defaultValue (TestList([], Normal))
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
|> Tests.runTestsWithCLIArgs
[| Tests.CLIArguments.Sequenced
Tests.CLIArguments.Verbosity LogLevel.Debug
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
argv
11 changes: 6 additions & 5 deletions src/test/Fake.Core.UnitTests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ open Fake.ExpectoSupport

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

Tests.runTestsInAssembly
{ config with
printer = ExpectoHelpers.fakeDefaultPrinter
verbosity = LogLevel.Debug }
testFromThisAssembly ()
|> Option.defaultValue (TestList([], Normal))
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.))
|> Tests.runTestsWithCLIArgs
[| Tests.CLIArguments.Verbosity LogLevel.Debug
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
argv
14 changes: 7 additions & 7 deletions src/test/Fake.DotNet.Cli.IntegrationTests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ open System

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

Tests.runTestsInAssembly
{ config with
runInParallel = false
parallelWorkers = 0
printer = ExpectoHelpers.fakeDefaultPrinter
verbosity = LogLevel.Debug }
testFromThisAssembly ()
|> Option.defaultValue (TestList([], Normal))
|> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(30.))
|> Tests.runTestsWithCLIArgs
[| Tests.CLIArguments.Sequenced
Tests.CLIArguments.Verbosity LogLevel.Debug
Tests.CLIArguments.Printer ExpectoHelpers.fakeDefaultPrinter |]
argv
3 changes: 1 addition & 2 deletions src/test/Fake.ExpectoSupport/ExpectoHelpers.fs
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,4 @@ module ExpectoHelpers =
recMapping "" test


let addTimeout t config =
config |> addFilter (mapTest (withTimeout (t)))
let addTimeout t test = test |> mapTest (withTimeout (t))
2 changes: 1 addition & 1 deletion src/test/Fake.ExpectoSupport/Fake.ExpectoSupport.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading