Skip to content

Commit 5385bca

Browse files
wallymathieuwallymathieu
authored
Use f#+ 1.1 RC4 (#2)
1 parent 00d3250 commit 5385bca

6 files changed

Lines changed: 143 additions & 107 deletions

File tree

‎.paket/Paket.Restore.targets‎

Lines changed: 103 additions & 64 deletions
Large diffs are not rendered by default.

‎.travis.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@ sudo: required
33
dist: xenial
44

55
dotnet: 3.0.100
6-
mono:
7-
- latest # => "stable release"
8-
- alpha
9-
- beta
10-
- weekly # => "latest commits"
116
os:
127
- linux
138

149
script:
1510
- ./build.sh
1611

17-
matrix:
18-
fast_finish: true
19-
allow_failures:
20-
- mono: alpha
21-
- mono: beta
22-
- mono: weekly
12+
branches:
13+
only:
14+
- master

‎appveyor.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ artifacts:
1212
name: bin
1313
- path: dist
1414
name: dist
15+
branches:
16+
only:
17+
- master

‎paket.dependencies‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ source https://api.nuget.org/v3/index.json
33
storage: none
44
clitool dotnet-mono 0.5.2
55
nuget FSharp.Core 4.6.2
6-
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
6+
nuget Microsoft.SourceLink.GitHub copy_local: true
77
nuget Expecto 8.10.1
88
nuget YoloDev.Expecto.TestSdk 0.8.0
99
nuget Microsoft.NET.Test.Sdk 15.7.2
1010
nuget altcover ~> 5
1111
nuget NUnit ~> 3.
1212
nuget NUnit3TestAdapter ~> 3.
1313
nuget FsUnit ~> 3.
14-
nuget FSharpPlus 1.1.0-CI00272
14+
nuget FSharpPlus 1.1.0-RC4
1515

1616
// [ FAKE GROUP ]
1717
group Build

‎paket.lock‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,7 @@ NUGET
2121
Expecto (8.10.1)
2222
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.0)
2323
Mono.Cecil (>= 0.10.3) - restriction: || (>= net461) (>= netstandard2.0)
24-
FSharp.Core (4.6.2)
25-
System.Collections (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
26-
System.Console (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
27-
System.Diagnostics.Debug (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
28-
System.Diagnostics.Tools (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
29-
System.Globalization (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
30-
System.IO (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
31-
System.Linq (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
32-
System.Linq.Expressions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
33-
System.Linq.Queryable (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
34-
System.Net.Requests (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
35-
System.Reflection (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
36-
System.Reflection.Extensions (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
37-
System.Resources.ResourceManager (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
38-
System.Runtime (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
39-
System.Runtime.Extensions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
40-
System.Runtime.Numerics (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
41-
System.Text.RegularExpressions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
42-
System.Threading (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
43-
System.Threading.Tasks (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
44-
System.Threading.Tasks.Parallel (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
45-
System.Threading.Thread (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
46-
System.Threading.ThreadPool (>= 4.0.10) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
47-
System.Threading.Timer (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
48-
FSharpPlus (1.1.0-CI00272)
24+
FSharpPlus (1.1.0-RC4)
4925
FSharp.Core (>= 4.6.2) - restriction: || (>= net45) (>= netstandard2.0)
5026
System.ValueTuple (>= 4.4) - restriction: >= net45
5127
FsUnit (3.5)
@@ -68,7 +44,7 @@ NUGET
6844
Microsoft.Build.Framework (15.8.166) - restriction: || (&& (>= net46) (>= netcoreapp1.0)) (&& (>= netcoreapp1.0) (>= netstandard2.0))
6945
System.Runtime.Serialization.Primitives (>= 4.1.1) - restriction: && (< net46) (>= netstandard2.0)
7046
System.Threading.Thread (>= 4.0) - restriction: && (< net46) (>= netstandard2.0)
71-
Microsoft.Build.Tasks.Git (1.0.0-beta2-18618-05) - copy_local: true
47+
Microsoft.Build.Tasks.Git (1.0) - copy_local: true
7248
Microsoft.Build.Utilities.Core (15.8.166) - restriction: >= netcoreapp1.0
7349
Microsoft.Build.Framework (>= 15.8.166) - restriction: || (>= net46) (>= netstandard2.0)
7450
Microsoft.Win32.Registry (>= 4.3) - restriction: && (< net46) (>= netstandard2.0)
@@ -120,10 +96,10 @@ NUGET
12096
Microsoft.NETCore.DotNetAppHost (>= 2.2.2)
12197
Microsoft.NETCore.Platforms (2.2) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.5) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net35) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net35) (>= netstandard2.0) (< xamarinios) (< xamarinmac)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net35) (>= net461) (>= netstandard1.6)) (&& (>= net45) (< netstandard1.3) (>= netstandard2.0)) (&& (< net45) (>= netstandard2.0)) (&& (< net46) (>= net461) (>= netstandard2.0)) (>= netcoreapp1.0) (&& (< netstandard1.0) (>= netstandard2.0) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (< netstandard1.3) (>= netstandard2.0) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (>= netstandard2.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= wp8))
12298
Microsoft.NETCore.Targets (2.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net35) (>= netstandard1.5) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net35) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (>= netcoreapp1.0)
123-
Microsoft.SourceLink.Common (1.0.0-beta2-18618-05) - copy_local: true
124-
Microsoft.SourceLink.GitHub (1.0.0-beta2-18618-05) - copy_local: true
125-
Microsoft.Build.Tasks.Git (>= 1.0.0-beta2-18618-05)
126-
Microsoft.SourceLink.Common (>= 1.0.0-beta2-18618-05)
99+
Microsoft.SourceLink.Common (1.0) - copy_local: true
100+
Microsoft.SourceLink.GitHub (1.0) - copy_local: true
101+
Microsoft.Build.Tasks.Git (>= 1.0)
102+
Microsoft.SourceLink.Common (>= 1.0)
127103
Microsoft.TestPlatform.ObjectModel (15.7.2) - restriction: >= netcoreapp1.0
128104
NETStandard.Library (>= 1.6) - restriction: && (< net451) (>= netstandard1.5)
129105
System.ComponentModel.EventBasedAsync (>= 4.0.11) - restriction: && (< net451) (>= netstandard1.5)
@@ -853,6 +829,31 @@ NUGET
853829
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netcoreapp2.0)
854830
System.Collections.Immutable (>= 1.4) - restriction: || (>= net461) (>= netcoreapp2.0)
855831
System.ValueTuple (>= 4.4) - restriction: >= net461
832+
remote: https://api.nuget.org/v3/index.json
833+
FSharp.Core (4.6.2)
834+
System.Collections (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
835+
System.Console (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
836+
System.Diagnostics.Debug (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
837+
System.Diagnostics.Tools (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
838+
System.Globalization (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
839+
System.IO (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
840+
System.Linq (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
841+
System.Linq.Expressions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
842+
System.Linq.Queryable (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
843+
System.Net.Requests (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
844+
System.Reflection (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
845+
System.Reflection.Extensions (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
846+
System.Resources.ResourceManager (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
847+
System.Runtime (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
848+
System.Runtime.Extensions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
849+
System.Runtime.Numerics (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
850+
System.Text.RegularExpressions (>= 4.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
851+
System.Threading (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
852+
System.Threading.Tasks (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
853+
System.Threading.Tasks.Parallel (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
854+
System.Threading.Thread (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
855+
System.Threading.ThreadPool (>= 4.0.10) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
856+
System.Threading.Timer (>= 4.0.1) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
856857

857858
GROUP Build
858859
STORAGE: NONE

‎src/FSharpPlus.CSharp/Library.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,3 +318,4 @@ module Enums=
318318
let getValues<'t> ()=
319319
let values = System.Enum.GetValues (typeof<'t>)
320320
Enumerable.Cast<'t> values //Array.unbox
321+

0 commit comments

Comments
 (0)