diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 50bda28..1932e21 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -2,18 +2,11 @@ "version": 1, "isRoot": true, "tools": { - "fake-cli" : { - "version": "5.20.3", + "paket": { + "version": "6.0.6", "commands": [ - "fake" - ] - }, - "fable": { - "version": "3.0.0-nagareyama-rc-004", - "commands": [ - "fable" + "paket" ] } } -} - +} \ No newline at end of file diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 0ec2816..e230bb2 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -159,7 +159,7 @@ This value should match the version in the props generated by paket If they differ, this means we need to do a restore in order to ensure correct dependencies --> - + true @@ -236,13 +236,16 @@ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) %(PaketReferencesFileLinesInfo.PackageVersion) All - runtime - runtime + runtime + $(ExcludeAssets);contentFiles + $(ExcludeAssets);build;buildMultitargeting;buildTransitive true true @@ -289,14 +292,16 @@ $(MSBuildProjectDirectory)/$(MSBuildProjectFile) true + false + true false - true + true false true false - true + true false - true + true $(PaketIntermediateOutputPath)\$(Configuration) $(PaketIntermediateOutputPath) @@ -314,6 +319,55 @@ + + + PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" + NoDefaultExcludes="$(NoDefaultExcludes)" /> Properties Fuchu.CSharpTests Fuchu.CSharpTests - net452;netcoreapp2.1 + net5.0 - - - + + + + diff --git a/Fuchu.FableTests/Fuchu.FableTests.fsproj b/Fuchu.FableTests/Fuchu.FableTests.fsproj index 4a17107..72faf7e 100644 --- a/Fuchu.FableTests/Fuchu.FableTests.fsproj +++ b/Fuchu.FableTests/Fuchu.FableTests.fsproj @@ -4,7 +4,7 @@ Exe Fuchu.FableTests Fuchu.FableTests - netcoreapp2.1 + net5.0 Fuchu.FableTests true Debug;Release;Fable @@ -13,6 +13,7 @@ $(DefineConstants);FABLE_COMPILER + @@ -20,10 +21,11 @@ - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/Fuchu.FableTests/paket.references b/Fuchu.FableTests/paket.references new file mode 100644 index 0000000..e69de29 diff --git a/Fuchu.FsCheck/FsCheck.fs b/Fuchu.FsCheck/FsCheck.fs index aab5b25..2efca08 100644 --- a/Fuchu.FsCheck/FsCheck.fs +++ b/Fuchu.FsCheck/FsCheck.fs @@ -16,43 +16,44 @@ module FuchuFsCheck = | :? IgnoreException as e -> Some e | _ -> None - let internal wrapRunner (r : IRunner) = + let internal wrapRunner (r: IRunner) = { new IRunner with member x.OnStartFixture t = r.OnStartFixture t - member x.OnArguments (ntest, args, every) = r.OnArguments (ntest, args, every) + member x.OnArguments(ntest, args, every) = r.OnArguments(ntest, args, every) member x.OnShrink(args, everyShrink) = r.OnShrink(args, everyShrink) - member x.OnFinished(name,testResult) = + + member x.OnFinished(name, testResult) = let msg = onFinishedToString name testResult + match testResult with | FsCheck.TestResult.True _ -> () - | FsCheck.TestResult.False (_,_,_, Outcome.Exception (Ignored e),_) -> raise e - | _ -> failtest msg - } + | FsCheck.TestResult.False (_, _, _, Outcome.Exception (Ignored e), _) -> raise e + | _ -> failtest msg } - let internal config = + let internal config = { Config.Default with - Runner = wrapRunner Config.Default.Runner } + Runner = wrapRunner Config.Default.Runner } - let testPropertyWithConfig (config: Config) name property = + let testPropertyWithConfig (config: Config) name property = let config = { config with - Runner = wrapRunner config.Runner } - testCase name <| - fun _ -> - ignore Runner.init.Value - FsCheck.Check.One(name, config, property) - + Runner = wrapRunner config.Runner } + + testCase name + <| fun _ -> + ignore Runner.init.Value + FsCheck.Check.One(name, config, property) + let testProperty name = testPropertyWithConfig config name type FsCheck = - static member Property(name, property: Func<_,bool>) = - testProperty name property.Invoke + static member Property(name, property: Func<_, bool>) = testProperty name property.Invoke - static member Property(name, property: Func<_,_,bool>) = - testProperty name (fun a b -> property.Invoke(a,b)) + static member Property(name, property: Func<_, _, bool>) = + testProperty name (fun a b -> property.Invoke(a, b)) - static member Property(name, property: Func<_,_,_,bool>) = - testProperty name (fun a b c -> property.Invoke(a,b,c)) + static member Property(name, property: Func<_, _, _, bool>) = + testProperty name (fun a b c -> property.Invoke(a, b, c)) - static member Property(name, property: Func<_,_,_,_,bool>) = - testProperty name (fun a b c d -> property.Invoke(a,b,c,d)) \ No newline at end of file + static member Property(name, property: Func<_, _, _, _, bool>) = + testProperty name (fun a b c d -> property.Invoke(a, b, c, d)) diff --git a/Fuchu.FsCheck/Fuchu.FsCheck.fsproj b/Fuchu.FsCheck/Fuchu.FsCheck.fsproj index f7e5e98..823db02 100644 --- a/Fuchu.FsCheck/Fuchu.FsCheck.fsproj +++ b/Fuchu.FsCheck/Fuchu.FsCheck.fsproj @@ -1,7 +1,7 @@  - net452;netstandard2.0 + net5.0 Library Fuchu.FsCheck Fuchu.FsCheck @@ -13,14 +13,16 @@ $(VersionPrefix) + - - - - - \ No newline at end of file + + + + + + diff --git a/Fuchu.FsCheck/paket.references b/Fuchu.FsCheck/paket.references new file mode 100644 index 0000000..e69de29 diff --git a/Fuchu.MbUnit/Fuchu.MbUnit.fsproj b/Fuchu.MbUnit/Fuchu.MbUnit.fsproj index 9c4d417..944327d 100644 --- a/Fuchu.MbUnit/Fuchu.MbUnit.fsproj +++ b/Fuchu.MbUnit/Fuchu.MbUnit.fsproj @@ -4,7 +4,7 @@ Library Fuchu.MbUnit Fuchu.MbUnit - net452;netstandard2.0 + net5.0 Fuchu.MbUnit Mauricio Scheffer Converts Fuchu tests to MbUnit tests @@ -13,6 +13,7 @@ $(VersionPrefix) + @@ -25,4 +26,5 @@ - \ No newline at end of file + + diff --git a/Fuchu.MbUnit/paket.references b/Fuchu.MbUnit/paket.references new file mode 100644 index 0000000..e69de29 diff --git a/Fuchu.PerfUtil.Charting/Fuchu.PerfUtil.Charting.fsproj b/Fuchu.PerfUtil.Charting/Fuchu.PerfUtil.Charting.fsproj index d82b954..a0ccc22 100644 --- a/Fuchu.PerfUtil.Charting/Fuchu.PerfUtil.Charting.fsproj +++ b/Fuchu.PerfUtil.Charting/Fuchu.PerfUtil.Charting.fsproj @@ -4,11 +4,12 @@ Library Fuchu.PerfUtil.Charting Fuchu.PerfUtil.Charting - net452 + net5.0 Fuchu.PerfUtil.Charting true + @@ -27,4 +28,5 @@ - \ No newline at end of file + + diff --git a/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj b/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj index 3cb47f0..fdae7db 100644 --- a/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj +++ b/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj @@ -4,7 +4,7 @@ Library Fuchu.PerfUtil Fuchu.PerfUtil - net452;netstandard2.0 + net5.0 Fuchu.PerfUtil true true @@ -15,6 +15,7 @@ + @@ -22,7 +23,8 @@ - - + + - \ No newline at end of file + + diff --git a/Fuchu.PerfUtil/paket.references b/Fuchu.PerfUtil/paket.references new file mode 100644 index 0000000..e69de29 diff --git a/Fuchu.TeamCity/Fuchu.TeamCity.fsproj b/Fuchu.TeamCity/Fuchu.TeamCity.fsproj index c9b563f..a873815 100644 --- a/Fuchu.TeamCity/Fuchu.TeamCity.fsproj +++ b/Fuchu.TeamCity/Fuchu.TeamCity.fsproj @@ -4,10 +4,11 @@ Library Fuchu.TeamCity Fuchu.TeamCity - net452 + net5.0 Fuchu.TeamCity + @@ -24,4 +25,5 @@ - \ No newline at end of file + + diff --git a/Fuchu.TeamCity/paket.references b/Fuchu.TeamCity/paket.references new file mode 100644 index 0000000..f5ed1cf --- /dev/null +++ b/Fuchu.TeamCity/paket.references @@ -0,0 +1 @@ +Gallio_MbUnit \ No newline at end of file diff --git a/Fuchu.Tests/Fuchu.Tests.fsproj b/Fuchu.Tests/Fuchu.Tests.fsproj index 31cdcde..f5e4e71 100644 --- a/Fuchu.Tests/Fuchu.Tests.fsproj +++ b/Fuchu.Tests/Fuchu.Tests.fsproj @@ -4,7 +4,7 @@ Exe Fuchu.Tests Fuchu.Tests - net452;netcoreapp2.1 + net5.0 Fuchu.Tests true Debug;Release;Fable @@ -13,6 +13,7 @@ $(DefineConstants);FABLE_COMPILER + @@ -31,8 +32,9 @@ - - - - - \ No newline at end of file + + + + + + diff --git a/Fuchu.Tests/paket.references b/Fuchu.Tests/paket.references new file mode 100644 index 0000000..e69de29 diff --git a/Fuchu/Fuchu.fsproj b/Fuchu/Fuchu.fsproj index af62bb6..82a769b 100644 --- a/Fuchu/Fuchu.fsproj +++ b/Fuchu/Fuchu.fsproj @@ -1,8 +1,7 @@  - net452;netstandard2.0 - netstandard2.0 + net5.0 Library Fuchu Fuchu @@ -19,6 +18,7 @@ + @@ -36,5 +36,5 @@ - - \ No newline at end of file + + diff --git a/Fuchu/paket.references b/Fuchu/paket.references new file mode 100644 index 0000000..e69de29 diff --git a/global.json b/global.json index 6096762..fbc419d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "3.0.103", + "version": "5.0.201", "rollForward": "latestMinor" } -} \ No newline at end of file +} diff --git a/paket.dependencies b/paket.dependencies index da25e35..2df8d9a 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,6 +2,7 @@ source https://www.nuget.org/api/v2 source https://api.nuget.org/v3/index.json storage: none +nuget Gallio_MbUnit 3.4.14.0 // [ FAKE GROUP ] group Build storage: none diff --git a/paket.lock b/paket.lock index 71a3302..ed91c94 100644 --- a/paket.lock +++ b/paket.lock @@ -1,4 +1,7 @@ STORAGE: NONE +NUGET + remote: https://www.nuget.org/api/v2 + Gallio_MbUnit (3.4.14) GROUP Build STORAGE: NONE