V5 2 (#284)

* 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 * Asyncinterfaces (#250) * use Microsoft.Bcl.AsyncInterfaces * Updated IcedTasks to 0.11.0 * Fix for fable * Net8 (#251) * net8 tfm * Update README * Fix CI cancellation issues * Build on macos-14 * 205 overload resolution (#252) * Missed this in net8 additions * Fix overload resolution issues in Core * Fix overload resolution issues in Tasks/Hopac * Fix overload resolution issues in CancellableTaskResult * WIP: TaskValidtionCE * Wip merge sources * Fix MergeSources for CTValidation * cleanup * Ensure IAsyncDisposable tests * ignore nuget stuff * feat(Seq)!: Add sequenceResultA, align sequenceResultM (#255) * Roll on '24 * refactor(Seq.sequenceResultM)!: Change Ok to Array * docs: sequenceResultM * feat(Seq): sequenceResultA * f sequenceResultM docs * Supress compile error * Fix proposed version * Cleanup build * 209 remove MergeSources (and!) from some implementations (#261) * Remove MergeSources from resultCE * Remove MergeSources from AsyncResult * Remove MergeSources from ResultOption * Fixup resultOption docs * Remove MergeSources from OptionCE * Remove MergeSources from ValueOptionCE * remove MergeSources Option/ValueOption * MSBuild.StructuredLogger update * disable binlog for fake * Many updates * fix residual rebase artifacts * Merge TaskResult into Core lib (#285) * silence FS3511 --------- Co-authored-by: Ruben Bartelink <[email protected]>
demystifyfp · Dec 7, 2024 · 83a5383 · 83a5383
1 parent d011683
commit 83a5383
Show file tree

Hide file tree

Showing 96 changed files with 4,785 additions and 4,914 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "paket": {
-            "version": "8.0.0",
+            "version": "8.0.3",
             "commands": [
                 "paket"
             ]

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -23,8 +23,8 @@
         "ghcr.io/devcontainers-contrib/features/starship:1": {},
         // https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
         "ghcr.io/devcontainers/features/dotnet:2": {
-            "version": "7.0",
-            "additionalVersions": "6.0"
+            "version": "8.0",
+            "additionalVersions": "7.0,6.0"
         },
         "ghcr.io/devcontainers/features/node:1": {
             "version": "18"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,14 @@
 name: Build master
 
-on: [push, pull_request]
+on:
+  # Runs only on pushes to the default branch or pull requests to the default branch
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
 
@@ -12,7 +20,7 @@ jobs:
         # Builds for Debug and Release configurations
         configuration: [Debug, Release]
         # Builds for Ubuntu, Windows, and macOS
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest, macos-14]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -22,6 +30,8 @@ jobs:
       with:
         global-json-file: global.json
         dotnet-version: |
+          8.x
+          7.x
           6.x
 
     - name: Build via Bash
@@ -44,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest, macos-14]
         node-version: ['18', '20', 'latest' ]
     runs-on: ${{ matrix.os }}
 
@@ -61,6 +71,8 @@ jobs:
       with:
         global-json-file: global.json
         dotnet-version: |
+          8.x
+          7.x
           6.x
 
     - name: Build via Bash
@@ -82,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest, macos-14]
         python-version: ['3.10', '3.11', '3.12']
     runs-on: ${{ matrix.os }}
 
@@ -99,8 +111,9 @@ jobs:
       with:
         global-json-file: global.json
         dotnet-version: |
+          8.x
+          7.x
           6.x
-
     - name: Build via Bash
       if: runner.os != 'Windows'
       run: |

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
-    <PropertyGroup>
-        <DisableCheckingDuplicateNuGetItems>true</DisableCheckingDuplicateNuGetItems>
-        <NoWarn>$(NoWarn);FS2003</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <WarningsAsErrors />
-    </PropertyGroup>
+  <PropertyGroup>
+    <DisableCheckingDuplicateNuGetItems>true</DisableCheckingDuplicateNuGetItems>
+    <NoWarn>$(NoWarn);FS2003; NU1903; NU1904</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
 </Project>
diff --git a/FsToolkit.ErrorHandling.sln b/FsToolkit.ErrorHandling.sln
@@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D8B86171
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.Tests", "tests\FsToolkit.ErrorHandling.Tests\FsToolkit.ErrorHandling.Tests.fsproj", "{F646F4E8-EA06-4EA8-9CD3-79778B264320}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.TaskResult", "src\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj", "{EA9FB942-F6A4-4539-9377-A2DBE73861FC}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.TaskResult.Tests", "tests\FsToolkit.ErrorHandling.TaskResult.Tests\FsToolkit.ErrorHandling.TaskResult.Tests.fsproj", "{868CA980-5903-480E-8360-C51F5EC83275}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.JobResult", "src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj", "{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}"
@@ -72,18 +70,6 @@ Global
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x64.Build.0 = Release|Any CPU
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x86.ActiveCfg = Release|Any CPU
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x86.Build.0 = Release|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Debug|x64.Build.0 = Debug|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Debug|x86.Build.0 = Debug|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Release|x64.ActiveCfg = Release|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Release|x64.Build.0 = Release|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC}.Release|x86.Build.0 = Release|Any CPU
 		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -220,7 +206,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{E0466000-F8E4-416B-B605-C65F7602367A} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
-		{EA9FB942-F6A4-4539-9377-A2DBE73861FC} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
 		{868CA980-5903-480E-8360-C51F5EC83275} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
 		{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
 		{7DABAB8F-4A02-4992-A3A2-6C550F98C13B} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ The library provides utility functions like `map`, `bind`, `apply`, `traverse`,
 
 It was inspired by [Chessie](https://github.com/fsprojects/Chessie) and Cvdm.ErrorHandling (the latter has now been merged into FsToolkit.ErrorHandling).
 
-FsToolkit.ErrorHandling targets .NET Standard 2.0 and .NET Framework 4.6.1 and supports Fable.
+FsToolkit.ErrorHandling targets .NET Standard 2.0, .NET Standard2.1 and supports Fable.
 
 ## Documentation
 
@@ -47,6 +47,7 @@ This repository has a devcontainer setup for VSCode. For more infomation see:
 * [.NET Core SDK](https://www.microsoft.com/net/download/)
   * [v6.x](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
   * [v7.x](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
+  * [v8.x](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 
 #### Optional 
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,13 @@
+### 5.0.0-beta001
+- BREAKING: [Remove Ply and update to FSharp 6](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/248) Credits @TheAngryByrd
+- BREAKING: [Remove MergeSources (and!) from some implementations](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/261)  Credits @TheAngryByrd
+- [Use Microsoft.Bcl.AsyncInterfaces in netstandard2.0 (Allows IAsyncDisposable and IAsyncEnumerable)](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/250) Credits @TheAngryByrd
+- [Build against Net8](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/251) Credits @TheAngryByrd
+- [Fix Overload Resolution to Align to Computation Expression used](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/252) Credits @TheAngryByrd
+- [refactor!: Seq.sequenceResultM returns Array instead of seq](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/255) Credits @bartelink
+- [feat(Seq): sequenceResultA](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/255) Credits @bartelink
+
+
 ### 4.18.0 - October 23, 2024
 - [Add Array errorhandling](https://github.com/demystifyfp/FsToolkit.ErrorHandling/pull/279) Credits @DashieTM
 

diff --git a/benchmarks/ApplicativeTests.fs b/benchmarks/ApplicativeTests.fs
@@ -41,19 +41,6 @@ type Result_BindvsAndCEBenchmarks() =
         }
         |> ignore
 
-    [<Benchmark>]
-    member this.All_Success_And() =
-        result {
-            let! r1 = successSlowSync this.delay
-            and! r2 = successSlowSync this.delay
-            and! r3 = successSlowSync this.delay
-
-            return
-                r1
-                + r2
-                + r3
-        }
-        |> ignore
 
     [<Benchmark>]
     member this.Fail_First_Bind() =
@@ -69,20 +56,6 @@ type Result_BindvsAndCEBenchmarks() =
         }
         |> ignore
 
-    [<Benchmark>]
-    member this.Fail_First_And() =
-        result {
-            let! r1 = errorSlowSync this.delay
-            and! r2 = successSlowSync this.delay
-            and! r3 = successSlowSync this.delay
-
-            return
-                r1
-                + r2
-                + r3
-        }
-        |> ignore
-
     [<Benchmark>]
     member this.Fail_Mid_Bind() =
         result {
@@ -97,20 +70,6 @@ type Result_BindvsAndCEBenchmarks() =
         }
         |> ignore
 
-    [<Benchmark>]
-    member this.Fail_Mid_And() =
-        result {
-            let! r1 = successSlowSync this.delay
-            and! r2 = errorSlowSync this.delay
-            and! r3 = successSlowSync this.delay
-
-            return
-                r1
-                + r2
-                + r3
-        }
-        |> ignore
-
     [<Benchmark>]
     member this.Fail_Last_Bind() =
         result {
@@ -124,17 +83,3 @@ type Result_BindvsAndCEBenchmarks() =
                 + r3
         }
         |> ignore
-
-    [<Benchmark>]
-    member this.Fail_Last_And() =
-        result {
-            let! r1 = successSlowSync this.delay
-            and! r2 = successSlowSync this.delay
-            and! r3 = errorSlowSync this.delay
-
-            return
-                r1
-                + r2
-                + r3
-        }
-        |> ignore
diff --git a/benchmarks/benchmarks.fsproj b/benchmarks/benchmarks.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
@@ -31,4 +31,4 @@
     <ProjectReference Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>