Skip to content

Commit b1ed24b

Browse files
wallymathieuwallymathieu
committed
not NET45 && not NETSTANDARD2_0
1 parent 812f4eb commit b1ed24b

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

‎src/FSharpPlus/Control/Applicative.fs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type Apply =
3131
#if !FABLE_COMPILER
3232
static member ``<*>`` (f: Task<_> , x: Task<'T> , [<Optional>]_output: Task<'U> , [<Optional>]_mthd: Apply) = Task.apply f x : Task<'U>
3333
#endif
34-
#if NETSTANDARD2_1 && !FABLE_COMPILER
34+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
3535
static member ``<*>`` (f: ValueTask<_> , x: ValueTask<'T> , [<Optional>]_output: ValueTask<'U> , [<Optional>]_mthd: Apply) = ValueTask.apply f x : ValueTask<'U>
3636
#endif
3737
static member ``<*>`` (f: Async<_> , x: Async<'T> , [<Optional>]_output: Async<'U> , [<Optional>]_mthd: Apply) = Async.apply f x : Async<'U>
@@ -104,7 +104,7 @@ type Lift2 =
104104
#if !FABLE_COMPILER
105105
static member Lift2 (f, (x: Task<'T> , y: Task<'U> ), _mthd: Lift2) = Task.map2 f x y
106106
#endif
107-
#if NETSTANDARD2_1 && !FABLE_COMPILER
107+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
108108
static member Lift2 (f, (x: ValueTask<'T> , y: ValueTask<'U> ), _mthd: Lift2) = ValueTask.map2 f x y
109109
#endif
110110
static member Lift2 (f, (x , y ), _mthd: Lift2) = Async.map2 f x y
@@ -151,7 +151,7 @@ type Lift3 =
151151
#if !FABLE_COMPILER
152152
static member Lift3 (f, (x: Task<'T> , y: Task<'U> , z: Task<'V> ), _mthd: Lift3) = Task.map3 f x y z
153153
#endif
154-
#if NETSTANDARD2_1 && !FABLE_COMPILER
154+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
155155
static member Lift3 (f, (x: ValueTask<'T> , y: ValueTask<'U> , z: ValueTask<'V> ), _mthd: Lift3) = ValueTask.map3 f x y z
156156
#endif
157157
static member Lift3 (f, (x , y , z ), _mthd: Lift3) = Async.map3 f x y z

‎src/FSharpPlus/Control/Comonad.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type Extract =
2929
#if !FABLE_COMPILER
3030
static member Extract (f: Task<'T> ) = f.Result
3131
#endif
32-
#if NETSTANDARD2_1 && !FABLE_COMPILER
32+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
3333
static member Extract (f: ValueTask<'T> ) = f.Result
3434
#endif
3535
static member inline Invoke (x: '``Comonad<'T>``) : 'T =
@@ -66,7 +66,7 @@ type Extend =
6666
tcs.Task
6767
#endif
6868

69-
#if NETSTANDARD2_1 && !FABLE_COMPILER
69+
#if (!NET45 && !NETSTANDARD2_0) && !FABLE_COMPILER
7070
static member (=>>) (g: ValueTask<'T> , f: ValueTask<'T> -> 'U ) : ValueTask<'U> =
7171
if g.IsCompletedSuccessfully then
7272
try

‎src/FSharpPlus/Control/Functor.fs

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ type Map =
6767
#if !FABLE_COMPILER
6868
static member Map ((x: Task<'T> , f: 'T->'U), _mthd: Map) = Task.map f x : Task<'U>
6969
#endif
70-
#if NETSTANDARD2_1 && !FABLE_COMPILER
70+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
7171
static member Map ((x: ValueTask<'T> , f: 'T->'U), _mthd: Map) = ValueTask.map f x : ValueTask<'U>
7272
#endif
7373
static member Map ((x: option<_> , f: 'T->'U), _mthd: Map) = Option.map f x
@@ -152,7 +152,7 @@ type Unzip =
152152
#if !FABLE_COMPILER
153153
static member Unzip ((source: Task<'T * 'U> , _output: Task<'T> * Task<'U> ) , _mthd: Unzip ) = Map.Invoke fst source, Map.Invoke snd source
154154
#endif
155-
#if NETSTANDARD2_1 && !FABLE_COMPILER
155+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
156156
static member Unzip ((source: ValueTask<'T * 'U> , _output: ValueTask<'T> * ValueTask<'U> ) , _mthd: Unzip ) = Map.Invoke fst source, Map.Invoke snd source
157157
#endif
158158
static member Unzip ((source: option<'T * 'U> , _output: option<'T> * option<'U> ) , _mthd: Unzip ) = Option.unzip source
@@ -222,7 +222,7 @@ type Zip =
222222
#if !FABLE_COMPILER
223223
static member Zip ((x: Task<'T> , y: Task<'U> , _output: Task<'T*'U> ), _mthd: Zip) = Task.zip x y
224224
#endif
225-
#if NETSTANDARD2_1 && !FABLE_COMPILER
225+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
226226
static member Zip ((x: ValueTask<'T> , y: ValueTask<'U> , _output: ValueTask<'T*'U> ), _mthd: Zip) = ValueTask.zip x y
227227
#endif
228228

‎src/FSharpPlus/Control/Monad.fs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Bind =
2222
static member (>>=) (source: Task<'T> , f: 'T -> Task<'U> ) = Task.bind f source : Task<'U>
2323
static member (>>=) (source , f: 'T -> _ ) = Nullable.bind f source : Nullable<'U>
2424
#endif
25-
#if NETSTANDARD2_1 && !FABLE_COMPILER
25+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
2626
static member (>>=) (source: ValueTask<'T> , f: 'T -> ValueTask<'U> ) = ValueTask.bind f source : ValueTask<'U>
2727
#endif
2828

@@ -83,7 +83,7 @@ type Join =
8383
#if !FABLE_COMPILER
8484
static member Join (x: Task<Task<_>> , [<Optional>]_output: Task<'T> , [<Optional>]_mthd: Join ) = Task.join x : Task<'T>
8585
#endif
86-
#if NETSTANDARD2_1 && !FABLE_COMPILER
86+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
8787
static member Join (x: ValueTask<ValueTask<_>> , [<Optional>]_output: ValueTask<'T> , [<Optional>]_mthd: Join ) = ValueTask.join x : ValueTask<'T>
8888
#endif
8989
static member Join (x , [<Optional>]_output: option<'T> , [<Optional>]_mthd: Join ) = Option.flatten x : option<'T>
@@ -144,7 +144,7 @@ type Return =
144144
#if !FABLE_COMPILER
145145
static member Return (_: 'T Task , _: Return ) = fun x -> Task.FromResult x : 'T Task
146146
#endif
147-
#if NETSTANDARD2_1 && !FABLE_COMPILER
147+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
148148
static member Return (_: 'T ValueTask , _: Return ) = fun (x: 'T) -> ValueTask<'T> x : 'T ValueTask
149149
#endif
150150
static member Return (_: option<'a> , _: Return ) = fun x -> Some x : option<'a>
@@ -195,7 +195,7 @@ type Delay =
195195

196196
#endif
197197

198-
#if NETSTANDARD2_1 && !FABLE_COMPILER
198+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
199199
static member Delay (_mthd: Delay , x: unit-> ValueTask<_> , _ ) = x () : ValueTask<'T>
200200
#endif
201201

‎src/FSharpPlus/Control/Monoid.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ type Plus with
119119
static member inline ``+`` (x: 'a Task, y: 'a Task, [<Optional>]_mthd: Plus) = Task.map2 Plus.Invoke x y
120120
#endif
121121

122-
#if NETSTANDARD2_1 && !FABLE_COMPILER
122+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
123123
type Plus with
124124

125125
static member inline ``+`` (x: 'a ValueTask, y: 'a ValueTask, [<Optional>]_mthd: Plus) = ValueTask.map2 Plus.Invoke x y

‎src/FSharpPlus/Control/Numeric.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ type Zero with
193193
s.SetResult v
194194
s.Task
195195
#endif
196-
#if NETSTANDARD2_1 && !FABLE_COMPILER
196+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
197197
static member inline Zero (_: ValueTask<'a>, _: Zero) : ValueTask<'a> =
198198
let (v: 'a) = Zero.Invoke ()
199199
ValueTask<'a>(v)

‎src/FSharpPlus/Extensions/ValueTask.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace FSharpPlus
22

3-
#if NETSTANDARD2_1_OR_GREATER && !FABLE_COMPILER
3+
#if !NET45 && !NETSTANDARD2_0 && !FABLE_COMPILER
44

55
/// Additional operations on ValueTask<'T>
66
[<RequireQualifiedAccess>]

‎tests/FSharpPlus.Tests/ValueTask.fs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace FSharpPlus.Tests
22

3+
#if !NET462 && !NETSTANDARD2_0
34

45
module ValueTask =
56

@@ -114,3 +115,4 @@ module ValueTask =
114115
let r09 = ValueTask.bind (binding true) (x1 ())
115116
r09.AsTask().Exception.InnerExceptions |> areEquivalent [TestException "I was told to fail"]
116117

118+
#endif

0 commit comments

Comments
 (0)