Skip to content

Fix netstandard2 package version #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2023
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "7.2.0-alpha003",
"version": "8.0.0",
"commands": [
"paket"
]
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/paket.references
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ group Benchmarks
FSharp.Core
BenchmarkDotNet
BenchmarkDotNet.Annotations
BenchmarkDotNet.Diagnostics.Windows
BenchmarkDotNet.Diagnostics.Windows
3 changes: 1 addition & 2 deletions build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,7 @@ let initTargets () =
==>! "Build"

"Build"
==> "DotnetTest"
==>! "DotnetPack"
==>! "DotnetTest"
//*** Dotnet Build ***//


Expand Down
46 changes: 21 additions & 25 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,21 @@ source https://api.nuget.org/v3/index.json


storage: none
framework: netstandard2.0, netstandard2.1, net6.0, net7.0
nuget FSharp.Core >= 7.0.0
nuget Hopac
nuget FSharp.Control.AsyncSeq 3.2.1

nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
nuget Ply
nuget Expecto
nuget Expecto.Hopac
nuget Microsoft.NET.Test.Sdk
nuget YoloDev.Expecto.TestSdk
nuget Fable.Mocha
nuget Fable.Pyxpecto
nuget Fable.Core >= 4.0.0




group NetStandard2
source https://api.nuget.org/v3/index.json
lowest_matching: true
strategy: min
nuget FSharp.Core >= 4.7.2
nuget Ply
nuget Hopac
nuget FSharp.Control.AsyncSeq
nuget Expecto
nuget Expecto.Hopac
nuget Microsoft.NET.Test.Sdk
nuget YoloDev.Expecto.TestSdk
nuget Fable.Mocha
nuget Fable.Pyxpecto
nuget Fable.Core >= 4.0.0
nuget Fable.Core >= 4.2.0
framework: netstandard2.0, net6.0
storage: none
condition: netstandard2_0
Expand All @@ -40,21 +26,31 @@ condition: netstandard2_0

group NetStandard2_1
source https://api.nuget.org/v3/index.json
lowest_matching: true
strategy: min
nuget FSharp.Core >= 7.0.0
nuget Hopac
nuget FSharp.Control.AsyncSeq
nuget IcedTasks >= 0.7.0
framework: netstandard2.1, net7.0
storage: none
condition: netstandard2_1

group Test
source https://api.nuget.org/v3/index.json
storage: none
lowest_matching: true
strategy: min
nuget FSharp.Core ~> 7.0.0
nuget Expecto
nuget Expecto.Hopac
nuget Microsoft.NET.Test.Sdk
nuget YoloDev.Expecto.TestSdk
nuget Fable.Core
nuget Fable.Mocha
nuget Fable.Python
nuget Fable.Pyxpecto
nuget Fable.Core >= 4.0.0
nuget IcedTasks >= 0.7.0
framework: netstandard2.1, net7.0
storage: none
condition: netstandard2_1

nuget Ply

group Benchmarks
source https://api.nuget.org/v3/index.json
Expand Down
357 changes: 145 additions & 212 deletions paket.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ let main argv =
Mocha.runTests allTests
#endif
#if !FABLE_COMPILER
Tests.runTestsWithArgs defaultConfig argv allTests
Tests.runTestsWithCLIArgs [] argv allTests
#endif
22 changes: 8 additions & 14 deletions tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/paket.references
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
group NetStandard2
Ply
Expecto
Fable.Mocha
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto

group NetStandard2_1
Expecto
Fable.Mocha
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto
group Test
FSharp.Core
Expecto
Expecto.Hopac
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Mocha
Fable.Pyxpecto
2 changes: 1 addition & 1 deletion tests/FsToolkit.ErrorHandling.IcedTasks.Tests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ open Expecto
module Main =
[<EntryPoint>]
let main argv =
Tests.runTestsInAssembly defaultConfig argv
Tests.runTestsInAssemblyWithCLIArgs [] argv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group NetStandard2_1
group Test
Expecto
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Expand Down
2 changes: 1 addition & 1 deletion tests/FsToolkit.ErrorHandling.JobResult.Tests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ open Expecto

[<EntryPoint>]
let main argv =
Tests.runTestsInAssembly defaultConfig argv
Tests.runTestsInAssemblyWithCLIArgs [] argv
22 changes: 8 additions & 14 deletions tests/FsToolkit.ErrorHandling.JobResult.Tests/paket.references
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
group NetStandard2
Ply
Expecto
Expecto.Hopac
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto

group NetStandard2_1
Expecto
Expecto.Hopac
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto
group Test
Expecto
Expecto.Hopac
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Mocha
Fable.Pyxpecto
Ply
2 changes: 1 addition & 1 deletion tests/FsToolkit.ErrorHandling.TaskResult.Tests/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ open Expecto

[<EntryPoint>]
let main argv =
Tests.runTestsInAssembly defaultConfig argv
Tests.runTestsInAssemblyWithCLIArgs [] argv
20 changes: 9 additions & 11 deletions tests/FsToolkit.ErrorHandling.TaskResult.Tests/paket.references
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
group NetStandard2
Ply
Expecto
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto
group NetStandard2_1
Expecto
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto

group Test
Expecto
Expecto.Hopac
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Mocha
Fable.Pyxpecto
Ply
25 changes: 9 additions & 16 deletions tests/FsToolkit.ErrorHandling.Tests/paket.references
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
group NetStandard2
FSharp.Core
Ply
Expecto
Fable.Mocha
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto

group NetStandard2_1
FSharp.Core
Expecto
Fable.Mocha
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Pyxpecto
group Test
FSharp.Core
Ply
Expecto
Expecto.Hopac
Microsoft.NET.Test.Sdk
YoloDev.Expecto.TestSdk
Fable.Mocha
Fable.Pyxpecto