Skip to content

Commit cfbf11d

Browse files
committed
Pins sdk to 5.0.103
ionide has an issue with msbuild graph project cracking
1 parent 5a652a4 commit cfbf11d

File tree

6 files changed

+22
-27
lines changed

6 files changed

+22
-27
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "5.0.201"
3+
"version": "5.0.103"
44
}
55
}

src/FsToolkit.ErrorHandling/OptionCE.fs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ namespace FsToolkit.ErrorHandling
44
module OptionCE =
55
open System
66
type OptionBuilder() =
7-
member inline this.Return(x) = Some x
7+
member inline _.Return(x) = Some x
88

9-
member inline this.ReturnFrom(m: 'T option) = m
9+
member inline _.ReturnFrom(m: 'T option) = m
1010

1111
member inline _.Bind(m : Option<'a>, f: 'a -> Option<'b>) = Option.bind f m
1212

13-
// Could not get Source to work since in loop cases it would match the #seq overload and ask for type annotation
13+
// Could not get it to work solely with Source. In loop cases it would potentially match the #seq overload and ask for type annotation
1414
member this.Bind(m : 'a when 'a:null, f: 'a -> Option<'b>) = this.Bind(m |> Option.ofObj, f)
1515

1616
member inline this.Zero() = this.Return ()
1717

18-
member inline this.Combine(m, f) = Option.bind f m
18+
member inline _.Combine(m, f) = Option.bind f m
1919
member inline this.Combine(m1 : Option<_>, m2 : Option<_>) = this.Bind(m1 , fun () -> m2)
2020

21-
member inline this.Delay(f: unit -> _) = f
21+
member inline _.Delay(f: unit -> _) = f
2222

23-
member inline this.Run(f) = f()
23+
member inline _.Run(f) = f()
2424

2525
member inline this.TryWith(m, h) =
2626
try this.Run m
@@ -84,21 +84,20 @@ module OptionExtensionsLower =
8484
[<AutoOpen>]
8585
// Having members as extensions gives them lower priority in
8686
// overload resolution and allows skipping more type annotations.
87+
// The later declared, the higher than previous extension methods, this is magic
8788
module OptionExtensions =
88-
open System
89-
type OptionBuilder with
90-
/// <summary>
91-
/// Needed to allow `for..in` and `for..do` functionality
92-
/// </summary>
93-
member inline __.Source(s: #seq<_>) = s
94-
89+
open System
90+
type OptionBuilder with
91+
/// <summary>
92+
/// Needed to allow `for..in` and `for..do` functionality
93+
/// </summary>
94+
member inline _.Source(s: #seq<_>) = s
9595

96-
// /// <summary>
97-
// /// Method lets us transform data types into our internal representation.
98-
// /// </summary>
99-
member inline this.Source(nullable : Nullable<'a>) : Option<'a> = nullable |> Option.ofNullable
10096

97+
// /// <summary>
98+
// /// Method lets us transform data types into our internal representation.
99+
// /// </summary>
100+
member inline _.Source(nullable : Nullable<'a>) : Option<'a> = nullable |> Option.ofNullable
101101

102-
103102

104103

tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net472</TargetFrameworks>
5-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
6-
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
4+
<TargetFramework>net5.0</TargetFramework>
75
</PropertyGroup>
86
<ItemGroup>
97
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj">

tests/FsToolkit.ErrorHandling.TaskResult.Tests/FsToolkit.ErrorHandling.TaskResult.Tests.fsproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net472</TargetFrameworks>
5-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
6-
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
4+
<TargetFramework>net5.0</TargetFramework>
75
</PropertyGroup>
86
<ItemGroup>
97
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.TaskResult/FsToolkit.ErrorHandling.TaskResult.fsproj">

tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net472</TargetFrameworks>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
77
<LangVersion>preview</LangVersion>

tests/FsToolkit.ErrorHandling.Tests/OptionCE.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ open Expecto
88
#endif
99
open FsToolkit.ErrorHandling
1010
open System
11+
open System.Collections.Generic
1112

1213
let makeDisposable () =
1314
{ new System.IDisposable
@@ -177,7 +178,6 @@ let ceTests =
177178
return v
178179
}
179180
Expect.equal actual None ""
180-
181181
]
182182

183183
[<AllowNullLiteral>]

0 commit comments

Comments
 (0)