Skip to content

Commit 93c3e2a

Browse files
TheAngryByrdTheAngryByrd
committed
Remove Ply and update to FSharp 6 (#248)
* remove Ply and update to FSharp 6 * Cleanup dependencies * Fix fsharp.core warning * Don't build so much
1 parent d011683 commit 93c3e2a

File tree

35 files changed

+159
-1222
lines changed

35 files changed

+159
-1222
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: Build master
22

3-
on: [push, pull_request]
3+
on:
4+
# Runs only on pushes to the default branch or pull requests to the default branch
5+
push:
6+
branches:
7+
- master
8+
pull_request:
9+
branches:
10+
- master
411

512
jobs:
613

‎paket.dependencies‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,16 @@ source https://api.nuget.org/v3/index.json
22

33

44
storage: none
5-
6-
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
7-
8-
9-
10-
11-
group NetStandard2
12-
source https://api.nuget.org/v3/index.json
135
lowest_matching: true
146
strategy: min
15-
nuget FSharp.Core >= 4.7.2
16-
nuget Ply
17-
nuget Hopac
18-
nuget FSharp.Control.AsyncSeq
7+
nuget FSharp.Core >= 6.0.1
8+
nuget Hopac >= 0.5.1
9+
nuget FSharp.Control.AsyncSeq >= 3.2.1
1910
nuget Fable.Core >= 4.2.0
20-
framework: netstandard2.0, net6.0
21-
storage: none
22-
condition: netstandard2_0
23-
24-
11+
nuget IcedTasks >= 0.10.2
12+
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
2513

2614

27-
group NetStandard2_1
28-
source https://api.nuget.org/v3/index.json
29-
lowest_matching: true
30-
strategy: min
31-
nuget FSharp.Core >= 7.0.0
32-
nuget Hopac
33-
nuget FSharp.Control.AsyncSeq
34-
nuget IcedTasks >= 0.7.0
35-
framework: netstandard2.1, net7.0
36-
storage: none
37-
condition: netstandard2_1
3815

3916
group Test
4017
source https://api.nuget.org/v3/index.json
@@ -50,7 +27,6 @@ nuget Fable.Core
5027
nuget Fable.Mocha
5128
nuget Fable.Python
5229
nuget Fable.Pyxpecto
53-
nuget Ply
5430

5531
group Benchmarks
5632
source https://api.nuget.org/v3/index.json

‎paket.lock‎

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
11
STORAGE: NONE
2+
STRATEGY: MIN
3+
LOWEST_MATCHING: TRUE
24
NUGET
35
remote: https://api.nuget.org/v3/index.json
6+
Fable.Core (4.2)
7+
FSharp.Control.AsyncSeq (3.2.1)
8+
FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0
9+
Microsoft.Bcl.AsyncInterfaces (>= 5.0) - restriction: >= netstandard2.0
10+
FSharp.Core (6.0.1)
11+
Hopac (0.5.1)
12+
FSharp.Core (>= 4.5.2) - restriction: >= netstandard2.0
13+
IcedTasks (0.10.2)
14+
FSharp.Core (>= 6.0.1) - restriction: >= netstandard2.0
15+
Microsoft.Bcl.AsyncInterfaces (5.0) - restriction: >= netstandard2.0
16+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net461) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
417
Microsoft.Build.Tasks.Git (8.0) - copy_local: true
518
Microsoft.SourceLink.Common (8.0) - copy_local: true
619
Microsoft.SourceLink.GitHub (8.0) - copy_local: true
720
Microsoft.Build.Tasks.Git (>= 8.0)
821
Microsoft.SourceLink.Common (>= 8.0)
22+
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))
23+
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (>= net461) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
24+
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)
925

1026
GROUP Benchmarks
1127
STORAGE: NONE
@@ -843,48 +859,6 @@ NUGET
843859
System.Windows.Extensions (6.0) - restriction: >= netcoreapp3.1
844860
System.Drawing.Common (>= 6.0) - restriction: >= netcoreapp3.1
845861

846-
GROUP NetStandard2
847-
STORAGE: NONE
848-
STRATEGY: MIN
849-
LOWEST_MATCHING: TRUE
850-
CONDITION: NETSTANDARD2_0
851-
RESTRICTION: || (== net6.0) (== netstandard2.0)
852-
NUGET
853-
remote: https://api.nuget.org/v3/index.json
854-
Fable.Core (4.2)
855-
FSharp.Control.AsyncSeq (3.2.1)
856-
FSharp.Core (>= 4.7.2)
857-
Microsoft.Bcl.AsyncInterfaces (>= 5.0)
858-
FSharp.Core (4.7.2)
859-
Hopac (0.5.1)
860-
FSharp.Core (>= 4.5.2)
861-
Microsoft.Bcl.AsyncInterfaces (6.0)
862-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
863-
Ply (0.3.1)
864-
FSharp.Core (>= 4.6.2)
865-
System.Threading.Tasks.Extensions (>= 4.5.4)
866-
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0)
867-
System.Threading.Tasks.Extensions (4.5.4)
868-
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)
869-
870-
GROUP NetStandard2_1
871-
STORAGE: NONE
872-
STRATEGY: MIN
873-
LOWEST_MATCHING: TRUE
874-
CONDITION: NETSTANDARD2_1
875-
RESTRICTION: || (== net7.0) (== netstandard2.1)
876-
NUGET
877-
remote: https://api.nuget.org/v3/index.json
878-
FSharp.Control.AsyncSeq (3.2.1)
879-
FSharp.Core (>= 4.7.2)
880-
Microsoft.Bcl.AsyncInterfaces (>= 5.0)
881-
FSharp.Core (7.0.300)
882-
Hopac (0.5.1)
883-
FSharp.Core (>= 4.5.2)
884-
IcedTasks (0.7)
885-
FSharp.Core (>= 7.0)
886-
Microsoft.Bcl.AsyncInterfaces (6.0)
887-
888862
GROUP Test
889863
STORAGE: NONE
890864
STRATEGY: MIN
@@ -924,9 +898,6 @@ NUGET
924898
Mono.Cecil (0.11.5) - restriction: >= net6.0
925899
Newtonsoft.Json (13.0.3) - restriction: >= netcoreapp3.1
926900
NuGet.Frameworks (6.8) - restriction: >= netcoreapp3.1
927-
Ply (0.3.1)
928-
FSharp.Core (>= 4.6.2) - restriction: >= netstandard2.0
929-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: >= netstandard2.0
930901
System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net462) (>= netcoreapp3.1)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81))
931902
System.Collections.Immutable (8.0) - restriction: >= netcoreapp3.1
932903
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netstandard2.0))
@@ -936,9 +907,7 @@ NUGET
936907
System.Reflection.Metadata (8.0) - restriction: >= netcoreapp3.1
937908
System.Collections.Immutable (>= 8.0) - restriction: || (>= net462) (>= netstandard2.0)
938909
System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0))
939-
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (< netcoreapp2.1) (>= netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net461) (>= netstandard2.0)) (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81)) (&& (>= netcoreapp3.1) (>= uap10.1)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (>= wp8))
940-
System.Threading.Tasks.Extensions (4.5.4) - restriction: >= netstandard2.0
941-
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)
910+
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (< netcoreapp2.1) (>= netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81)) (&& (>= netcoreapp3.1) (>= uap10.1))
942911
YoloDev.Expecto.TestSdk (0.14.3)
943912
Expecto (>= 10.0 < 11.0) - restriction: >= net6.0
944913
FSharp.Core (>= 7.0.200) - restriction: >= net6.0

‎src/FsToolkit.ErrorHandling.AsyncSeq/paket.references‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
Microsoft.SourceLink.GitHub
2-
3-
group NetStandard2
4-
FSharp.Control.AsyncSeq
5-
group NetStandard2_1
6-
FSharp.Control.AsyncSeq
2+
FSharp.Core
3+
FSharp.Control.AsyncSeq

‎src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ module CancellableTaskResultCE =
177177
)
178178
)
179179

180+
#if NETSTANDARD2_1 || NET6_0_OR_GREATER
180181
member inline internal this.TryFinallyAsync
181182
(
182183
body: CancellableTaskResultCode<'TOverall, 'Error, 'T>,
@@ -238,7 +239,7 @@ module CancellableTaskResultCE =
238239
ValueTask()
239240
)
240241
)
241-
242+
#endif
242243
member inline this.Source
243244
(ctr: CancellableTaskResult<'T, 'Error>)
244245
: CancellableTaskResult<'T, 'Error> =
@@ -257,9 +258,10 @@ module CancellableTaskResultCE =
257258
|> Async.map Result.ofChoice
258259
|> this.Source
259260

261+
#if NETSTANDARD2_1 || NET6_0_OR_GREATER
260262
member inline _.Source(t: ValueTask<Result<_, _>>) : CancellableTaskResult<'T, 'Error> =
261263
cancellableTask { return! t }
262-
264+
#endif
263265
member inline _.Source(result: Result<_, _>) : CancellableTaskResult<_, _> =
264266
CancellableTask.singleton result
265267

‎src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ module CancellableTaskValidationCE =
175175
)
176176
)
177177
)
178-
178+
#if NETSTANDARD2_1 || NET6_0_OR_GREATER
179179
member inline internal this.TryFinallyAsync
180180
(
181181
[<InlineIfLambda>] body: CancellableTaskValidationCode<'TOverall, 'Error, 'T>,
@@ -238,7 +238,7 @@ module CancellableTaskValidationCE =
238238
ValueTask()
239239
)
240240
)
241-
241+
#endif
242242

243243
[<NoEagerConstraintApplication>]
244244
static member inline BindDynamic

‎src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netstandard2.1</TargetFrameworks>
6-
<LangVersion>preview</LangVersion>
7-
<DebugType>portable</DebugType>
8-
<NoWarn>FS3511;FS3513</NoWarn>
9-
</PropertyGroup>
10-
<ItemGroup>
11-
<Compile Include="CancellableTaskResultCE.fs" />
12-
<None Include="paket.references" />
13-
<Compile Include="CancellableTaskValidationCE.fs" />
14-
<Compile Include="CancellableTaskValidationOp.fs" />
15-
<Watch Include="@(None)" />
16-
</ItemGroup>
17-
<ItemGroup>
18-
<ProjectReference Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
19-
</ItemGroup>
20-
<Import Project="..\..\.paket\Paket.Restore.targets" />
21-
</Project>
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
6+
<LangVersion>preview</LangVersion>
7+
<DebugType>portable</DebugType>
8+
<NoWarn>FS3511;FS3513</NoWarn>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<Compile Include="CancellableTaskResultCE.fs" />
12+
<None Include="paket.references" />
13+
<Compile Include="CancellableTaskValidationCE.fs" />
14+
<Compile Include="CancellableTaskValidationOp.fs" />
15+
<Watch Include="@(None)" />
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ProjectReference
19+
Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
20+
</ItemGroup>
21+
<Import Project="..\..\.paket\Paket.Restore.targets" />
22+
</Project>

‎src/FsToolkit.ErrorHandling.IcedTasks/paket.references‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

22
Microsoft.SourceLink.GitHub
3-
4-
group NetStandard2_1
5-
FSharp.Core
6-
IcedTasks
3+
FSharp.Core
4+
IcedTasks

‎src/FsToolkit.ErrorHandling.JobResult/paket.references‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
Microsoft.SourceLink.GitHub
2-
3-
group NetStandard2
4-
Hopac
5-
group NetStandard2_1
6-
Hopac
2+
FSharp.Core
3+
Hopac

‎src/FsToolkit.ErrorHandling.TaskResult/List.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ namespace FsToolkit.ErrorHandling
22

33
open System.Threading.Tasks
44
open FsToolkit.ErrorHandling
5-
#if NETSTANDARD2_0
6-
open FSharp.Control.Tasks.Affine
7-
#endif
85

96
[<RequireQualifiedAccess>]
107
module List =

0 commit comments

Comments
 (0)