diff --git a/paket.dependencies b/paket.dependencies index 989df85e..9afb8e55 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,36 +2,16 @@ source https://api.nuget.org/v3/index.json storage: none - -nuget Microsoft.SourceLink.GitHub prerelease copy_local: true - - -group NetStandard2 -source https://api.nuget.org/v3/index.json lowest_matching: true strategy: min nuget FSharp.Core >= 6.0.1 -nuget Hopac -nuget FSharp.Control.AsyncSeq +nuget Hopac >= 0.5.1 +nuget FSharp.Control.AsyncSeq >= 3.2.1 nuget Fable.Core >= 4.2.0 -framework: netstandard2.0, net6.0 -storage: none -condition: netstandard2_0 - - +nuget IcedTasks >= 0.10.2 +nuget Microsoft.SourceLink.GitHub prerelease copy_local: true -group NetStandard2_1 -source https://api.nuget.org/v3/index.json -lowest_matching: true -strategy: min -nuget FSharp.Core >= 6.0.1 -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 diff --git a/paket.lock b/paket.lock index b77a8c10..b5222558 100644 --- a/paket.lock +++ b/paket.lock @@ -1,11 +1,27 @@ STORAGE: NONE +STRATEGY: MIN +LOWEST_MATCHING: TRUE NUGET remote: https://api.nuget.org/v3/index.json + Fable.Core (4.2) + FSharp.Control.AsyncSeq (3.2.1) + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Microsoft.Bcl.AsyncInterfaces (>= 5.0) - restriction: >= netstandard2.0 + FSharp.Core (6.0.1) + Hopac (0.5.1) + FSharp.Core (>= 4.5.2) - restriction: >= netstandard2.0 + IcedTasks (0.10.2) + FSharp.Core (>= 6.0.1) - restriction: >= netstandard2.0 + Microsoft.Bcl.AsyncInterfaces (5.0) - restriction: >= netstandard2.0 + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net461) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1)) Microsoft.Build.Tasks.Git (8.0) - copy_local: true Microsoft.SourceLink.Common (8.0) - copy_local: true Microsoft.SourceLink.GitHub (8.0) - copy_local: true Microsoft.Build.Tasks.Git (>= 8.0) Microsoft.SourceLink.Common (>= 8.0) + System.Runtime.CompilerServices.Unsafe (4.5.3) - restriction: || (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (>= net461) (>= netstandard2.0)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (>= wp8)) + System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (>= net461) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1)) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< win8)) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net461) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= wp8) GROUP Benchmarks STORAGE: NONE @@ -851,45 +867,6 @@ NUGET System.Windows.Extensions (6.0) - restriction: >= netcoreapp3.1 System.Drawing.Common (>= 6.0) - restriction: >= netcoreapp3.1 -GROUP NetStandard2 -STORAGE: NONE -STRATEGY: MIN -LOWEST_MATCHING: TRUE -CONDITION: NETSTANDARD2_0 -RESTRICTION: || (== net6.0) (== netstandard2.0) -NUGET - remote: https://api.nuget.org/v3/index.json - Fable.Core (4.2) - FSharp.Control.AsyncSeq (3.2.1) - FSharp.Core (>= 4.7.2) - Microsoft.Bcl.AsyncInterfaces (>= 5.0) - FSharp.Core (6.0.1) - Hopac (0.5.1) - FSharp.Core (>= 4.5.2) - Microsoft.Bcl.AsyncInterfaces (6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1) (< netstandard2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) - System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) - -GROUP NetStandard2_1 -STORAGE: NONE -STRATEGY: MIN -LOWEST_MATCHING: TRUE -CONDITION: NETSTANDARD2_1 -RESTRICTION: || (== net7.0) (== netstandard2.1) -NUGET - remote: https://api.nuget.org/v3/index.json - FSharp.Control.AsyncSeq (3.2.1) - FSharp.Core (>= 4.7.2) - Microsoft.Bcl.AsyncInterfaces (>= 5.0) - FSharp.Core (7.0.300) - Hopac (0.5.1) - FSharp.Core (>= 4.5.2) - IcedTasks (0.7) - FSharp.Core (>= 7.0) - Microsoft.Bcl.AsyncInterfaces (6.0) - GROUP Test STORAGE: NONE STRATEGY: MIN diff --git a/src/FsToolkit.ErrorHandling.AsyncSeq/paket.references b/src/FsToolkit.ErrorHandling.AsyncSeq/paket.references index d6776133..3320bac5 100644 --- a/src/FsToolkit.ErrorHandling.AsyncSeq/paket.references +++ b/src/FsToolkit.ErrorHandling.AsyncSeq/paket.references @@ -1,8 +1,3 @@ Microsoft.SourceLink.GitHub - -group NetStandard2 - FSharp.Core - FSharp.Control.AsyncSeq -group NetStandard2_1 - FSharp.Core - FSharp.Control.AsyncSeq +FSharp.Core +FSharp.Control.AsyncSeq diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs index c8648c2e..e5d2fa05 100644 --- a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs +++ b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs @@ -177,6 +177,7 @@ module CancellableTaskResultCE = ) ) +#if NETSTANDARD2_1 || NET6_0_OR_GREATER member inline internal this.TryFinallyAsync ( body: CancellableTaskResultCode<'TOverall, 'Error, 'T>, @@ -238,7 +239,7 @@ module CancellableTaskResultCE = ValueTask() ) ) - +#endif member inline this.Source (ctr: CancellableTaskResult<'T, 'Error>) : CancellableTaskResult<'T, 'Error> = @@ -257,9 +258,10 @@ module CancellableTaskResultCE = |> Async.map Result.ofChoice |> this.Source +#if NETSTANDARD2_1 || NET6_0_OR_GREATER member inline _.Source(t: ValueTask>) : CancellableTaskResult<'T, 'Error> = cancellableTask { return! t } - +#endif member inline _.Source(result: Result<_, _>) : CancellableTaskResult<_, _> = CancellableTask.singleton result diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs index 208879fd..08ff4bed 100644 --- a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs +++ b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs @@ -175,7 +175,7 @@ module CancellableTaskValidationCE = ) ) ) - +#if NETSTANDARD2_1 || NET6_0_OR_GREATER member inline internal this.TryFinallyAsync ( [] body: CancellableTaskValidationCode<'TOverall, 'Error, 'T>, @@ -238,7 +238,7 @@ module CancellableTaskValidationCE = ValueTask() ) ) - +#endif [] static member inline BindDynamic diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj b/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj index a06ce42a..d04c2fdb 100644 --- a/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj +++ b/src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj @@ -1,21 +1,22 @@  - - Library - netstandard2.1 - preview - portable - FS3511;FS3513 - - - - - - - - - - - - - \ No newline at end of file + + Library + netstandard2.0;netstandard2.1 + preview + portable + FS3511;FS3513 + + + + + + + + + + + + + diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/paket.references b/src/FsToolkit.ErrorHandling.IcedTasks/paket.references index 992c1aac..e9b80506 100644 --- a/src/FsToolkit.ErrorHandling.IcedTasks/paket.references +++ b/src/FsToolkit.ErrorHandling.IcedTasks/paket.references @@ -1,6 +1,4 @@ Microsoft.SourceLink.GitHub - -group NetStandard2_1 - FSharp.Core - IcedTasks \ No newline at end of file +FSharp.Core +IcedTasks diff --git a/src/FsToolkit.ErrorHandling.JobResult/paket.references b/src/FsToolkit.ErrorHandling.JobResult/paket.references index d550b81a..8bbf3f25 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/paket.references +++ b/src/FsToolkit.ErrorHandling.JobResult/paket.references @@ -1,8 +1,3 @@ Microsoft.SourceLink.GitHub - -group NetStandard2 - FSharp.Core - Hopac -group NetStandard2_1 - FSharp.Core - Hopac +FSharp.Core +Hopac diff --git a/src/FsToolkit.ErrorHandling/paket.references b/src/FsToolkit.ErrorHandling/paket.references index 84d229a8..53cac18a 100644 --- a/src/FsToolkit.ErrorHandling/paket.references +++ b/src/FsToolkit.ErrorHandling/paket.references @@ -1,7 +1,2 @@ - +FSharp.Core Microsoft.SourceLink.GitHub - -group NetStandard2 - FSharp.Core -group NetStandard2_1 - FSharp.Core diff --git a/tools/FunctionMap/paket.references b/tools/FunctionMap/paket.references index 1b2c8d6a..6f627f42 100644 --- a/tools/FunctionMap/paket.references +++ b/tools/FunctionMap/paket.references @@ -1,2 +1 @@ -group NetStandard2_1 - FSharp.Core \ No newline at end of file +FSharp.Core