Skip to content

Commit 4b81007

Browse files
committed
Merge branch 'master' into v5-2-remove-async-retn
2 parents 6bc9c1e + edc9ae0 commit 4b81007

File tree

10 files changed

+40
-37
lines changed

10 files changed

+40
-37
lines changed

RELEASE_NOTES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
### 5.0.0-beta001
1+
### 5.0.0-beta001 - December 7, 2024
22
- BREAKING: [Remove Ply and update to FSharp 6](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/248) Credits @TheAngryByrd
33
- BREAKING: [Remove MergeSources (and!) from some implementations](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/261) Credits @TheAngryByrd
4+
- BREAKING: [Merge TaskResult into Core library](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/285) Credits @TheAngryByrd
5+
- This means FsToolkit.ErrorHandling.TaskResult is no longer a separate package and will not be updated. It is now part of the core library.
46
- [Use Microsoft.Bcl.AsyncInterfaces in netstandard2.0 (Allows IAsyncDisposable and IAsyncEnumerable)](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/250) Credits @TheAngryByrd
57
- [Build against Net8](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/251) Credits @TheAngryByrd
68
- [Fix Overload Resolution to Align to Computation Expression used](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/252) Credits @TheAngryByrd
79
- [refactor!: Seq.sequenceResultM returns Array instead of seq](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/255) Credits @bartelink
810
- [feat(Seq): sequenceResultA](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/255) Credits @bartelink
11+
-
912

1013

1114
### 4.18.0 - October 23, 2024

src/FsToolkit.ErrorHandling.AsyncSeq/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.AsyncSeq")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.AsyncSeq"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

src/FsToolkit.ErrorHandling.IcedTasks/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.IcedTasks")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.IcedTasks"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

src/FsToolkit.ErrorHandling.JobResult/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.JobResult")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.JobResult"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

src/FsToolkit.ErrorHandling/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.AsyncSeq.Tests")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.AsyncSeq.Tests"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

tests/FsToolkit.ErrorHandling.IcedTasks.Tests/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.IcedTasks.Tests")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.IcedTasks.Tests"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

tests/FsToolkit.ErrorHandling.JobResult.Tests/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.JobResult.Tests")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.JobResult.Tests"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

tests/FsToolkit.ErrorHandling.TaskResult.Tests/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.TaskResult.Tests")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.TaskResult.Tests"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

tests/FsToolkit.ErrorHandling.Tests/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FsToolkit.ErrorHandling.Tests")>]
66
[<assembly: AssemblyProductAttribute("FsToolkit.ErrorHandling")>]
77
[<assembly: AssemblyDescriptionAttribute("FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.")>]
8-
[<assembly: AssemblyVersionAttribute("4.18.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("4.18.0")>]
8+
[<assembly: AssemblyVersionAttribute("5.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FsToolkit.ErrorHandling.Tests"
1515
let [<Literal>] AssemblyProduct = "FsToolkit.ErrorHandling"
1616
let [<Literal>] AssemblyDescription = "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
17-
let [<Literal>] AssemblyVersion = "4.18.0"
18-
let [<Literal>] AssemblyFileVersion = "4.18.0"
17+
let [<Literal>] AssemblyVersion = "5.0.0"
18+
let [<Literal>] AssemblyFileVersion = "5.0.0"
1919
let [<Literal>] AssemblyConfiguration = "Release"

0 commit comments

Comments
 (0)