diff --git a/build.proj b/build.proj
index d822cc84b..99309aa4b 100644
--- a/build.proj
+++ b/build.proj
@@ -24,7 +24,6 @@
-
diff --git a/samples/Infrastructure/Infrastructure.fsproj b/samples/Infrastructure/Infrastructure.fsproj
index ec7bf948d..e27d6a039 100644
--- a/samples/Infrastructure/Infrastructure.fsproj
+++ b/samples/Infrastructure/Infrastructure.fsproj
@@ -1,7 +1,7 @@
- netstandard2.0;net461
+ netstandard2.1
5
false
true
@@ -31,14 +31,11 @@
-
-
-
\ No newline at end of file
diff --git a/samples/Store/Integration/Integration.fsproj b/samples/Store/Integration/Integration.fsproj
index 906d1d38e..d39726d1f 100644
--- a/samples/Store/Integration/Integration.fsproj
+++ b/samples/Store/Integration/Integration.fsproj
@@ -1,7 +1,7 @@
- $(TestTargetFrameworks)
+ netcoreapp3.1
false
5
true
diff --git a/samples/Tutorial/Tutorial.fsproj b/samples/Tutorial/Tutorial.fsproj
index f94548ffd..250f0f066 100644
--- a/samples/Tutorial/Tutorial.fsproj
+++ b/samples/Tutorial/Tutorial.fsproj
@@ -1,7 +1,7 @@
- netstandard2.0;net461
+ netstandard2.1
5
true
true
@@ -31,8 +31,7 @@
-
-
+
diff --git a/src/Equinox.Core/Infrastructure.fs b/src/Equinox.Core/Infrastructure.fs
index b8003e109..d73177d6f 100755
--- a/src/Equinox.Core/Infrastructure.fs
+++ b/src/Equinox.Core/Infrastructure.fs
@@ -9,7 +9,7 @@ open System.Threading.Tasks
type OAttribute = System.Runtime.InteropServices.OptionalAttribute
type DAttribute = System.Runtime.InteropServices.DefaultParameterValueAttribute
-
+
#if NET461
module Array =
let tryHead (array : 'T[]) =
@@ -68,28 +68,6 @@ type Async with
sc ())
|> ignore)
-#if !NO_ASYNCSEQ
-module AsyncSeq =
- /// Same as takeWhileAsync, but returns the final element too
- let takeWhileInclusiveAsync p (source : AsyncSeq<'T>) : AsyncSeq<_> = asyncSeq {
- use ie = source.GetEnumerator()
- let! move = ie.MoveNext()
- let b = ref move
- while b.Value.IsSome do
- let v = b.Value.Value
- yield v
- let! res = p v
- if res then
- let! moven = ie.MoveNext()
- b := moven
- else
- b := None }
-
- /// Same as takeWhile, but returns the final element too
- let takeWhileInclusive p (source : AsyncSeq<'T>) =
- takeWhileInclusiveAsync (p >> async.Return) source
-#endif
-
[]
module Regex =
open System.Text.RegularExpressions
diff --git a/src/Equinox.Cosmos/Equinox.Cosmos.fsproj b/src/Equinox.Cosmos/Equinox.Cosmos.fsproj
index 718806d88..c68577ae8 100644
--- a/src/Equinox.Cosmos/Equinox.Cosmos.fsproj
+++ b/src/Equinox.Cosmos/Equinox.Cosmos.fsproj
@@ -1,7 +1,7 @@
- netstandard2.0;net461
+ netstandard2.1
5
false
true
@@ -19,16 +19,16 @@
+
-
-
-
+
+
\ No newline at end of file
diff --git a/tests/Equinox.Cosmos.Integration/Equinox.Cosmos.Integration.fsproj b/tests/Equinox.Cosmos.Integration/Equinox.Cosmos.Integration.fsproj
index d23f3f845..2355db821 100644
--- a/tests/Equinox.Cosmos.Integration/Equinox.Cosmos.Integration.fsproj
+++ b/tests/Equinox.Cosmos.Integration/Equinox.Cosmos.Integration.fsproj
@@ -1,11 +1,10 @@
- $(TestTargetFrameworks)
+ netcoreapp3.1
false
5
true
- NET461
@@ -30,7 +29,6 @@
-
diff --git a/tools/Equinox.Tool/Equinox.Tool.fsproj b/tools/Equinox.Tool/Equinox.Tool.fsproj
index be20ffd19..97da5bb79 100644
--- a/tools/Equinox.Tool/Equinox.Tool.fsproj
+++ b/tools/Equinox.Tool/Equinox.Tool.fsproj
@@ -1,14 +1,13 @@
- netcoreapp3.1;net461
+ netcoreapp3.1
Exe
true
5
false
true
true
- $(DefineConstants);NET461
Equinox.Tool
eqx
@@ -45,20 +44,6 @@
-
-
-
- netcoreapp3.1
-
-
-
-
- true
- tools\net461\any\%(Filename)%(Extension)
- true
-
-
-