Skip to content

Commit ddba8ab

Browse files
wallymathieuwallymathieu
committed
Merge branch 'master' into v1.3
2 parents 17b5584 + f646f98 commit ddba8ab

31 files changed

+384
-33
lines changed

‎.github/workflows/fable.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@ jobs:
4343
run: git submodule update --init --recursive
4444
- name: Remove global json
4545
run: rm global.json
46-
- name: Setup .NET Core
46+
- name: Remove global json in subfolder
47+
run: rm global.json
48+
working-directory: tests/FSharpPlusFable.Tests
49+
- name: Setup .NET Core 7
50+
uses: actions/setup-dotnet@v1
51+
with:
52+
dotnet-version: 7.0.100
53+
- name: Setup .NET Core 6
4754
uses: actions/setup-dotnet@v1
4855
with:
4956
dotnet-version: 6.0.201

‎FSharpPlus.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlusFable.Tests", "te
100100
EndProject
101101
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Benchmarks", "tests\benchmarks\Benchmarks.fsproj", "{EEFF08EB-8B0C-4F63-9425-4281EFF12087}"
102102
EndProject
103+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "docsTool", "docsrc\tools\docsTool.fsproj", "{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}"
104+
EndProject
103105
Global
104106
GlobalSection(SolutionConfigurationPlatforms) = preSolution
105107
Debug|Any CPU = Debug|Any CPU
@@ -227,6 +229,14 @@ Global
227229
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable|Any CPU.Build.0 = Debug|Any CPU
228230
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable3|Any CPU.ActiveCfg = Debug|Any CPU
229231
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable3|Any CPU.Build.0 = Debug|Any CPU
232+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
233+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
234+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
235+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Release|Any CPU.Build.0 = Release|Any CPU
236+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable|Any CPU.ActiveCfg = Debug|Any CPU
237+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable|Any CPU.Build.0 = Debug|Any CPU
238+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable3|Any CPU.ActiveCfg = Debug|Any CPU
239+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable3|Any CPU.Build.0 = Debug|Any CPU
230240
EndGlobalSection
231241
GlobalSection(SolutionProperties) = preSolution
232242
HideSolutionNode = FALSE
@@ -243,6 +253,7 @@ Global
243253
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
244254
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
245255
{EEFF08EB-8B0C-4F63-9425-4281EFF12087} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
256+
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2} = {83F16175-43B1-4C90-A1EE-8E351C33435D}
246257
EndGlobalSection
247258
GlobalSection(ExtensibilityGlobals) = postSolution
248259
SolutionGuid = {789B5FFA-7891-4F60-831E-42C3C5ED2C51}

‎docsrc/content/abstraction-applicative.fsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ From F#
6666
- ``Choice<'T,'U>``
6767
- ``KeyValuePair<'Key,'T>``
6868
- ``'Monoid * 'T``
69+
- ``'ValueTuple<Monoid, 'T>``
6970
- ``Task<'T>``
71+
- ``ValueTask<'T>``
7072
- ``'R->'T``
7173
- ``Expr<'T>``
7274
- ``ResizeArray<'T>``

‎docsrc/content/abstraction-bifoldable.fsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Concrete implementations
7878
From .Net/F#
7979
8080
- ``'T * 'U``
81+
- ``struct ('T * 'U)``
8182
- ``Result<'T,'U>``
8283
- ``Choice<'T,'U>``
8384

‎docsrc/content/abstraction-bifunctor.fsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Concrete implementations of Bifunctor<'T1,'T2>
6767
From .Net/F#
6868
6969
- ``'T1 * 'T2``
70+
- ``struct ('T1 * 'T2)``
7071
- ``Result<'T2,'T1>``
7172
- ``Choice<'T2,'T1>``
7273
- ``KeyValuePair<'T1,'T2>``

‎docsrc/content/abstraction-bitraversable.fsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Concrete implementations
5353
From .Net/F#
5454
5555
- ``'T * 'U``
56+
- ``struct ('T * 'U)``
5657
- ``Result<'T,'U>``
5758
- ``Choice<'T,'U>``
5859

‎docsrc/content/abstraction-comonad.fsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ From .Net/F#
6666
- ``Lazy<'T>``
6767
- ``Id<'T>``
6868
- ``('W * 'T)``
69+
- ``struct ('W * 'T)``
6970
- ``'Monoid -> 'T``
71+
- ``ValueTask<'T>``
7072
7173
7274
From F#+

‎docsrc/content/abstraction-functor.fsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ From F#
5757
- ``KeyValuePair<'Key,'T>``
5858
- ``Map<'Key,'T>``
5959
- ``'Monoid * 'T``
60+
- ``'struct ('Monoid * 'T)``
6061
- ``Task<'T>``
62+
- ``ValueTask<'T>``
6163
- ``'R->'T``
6264
- ``Expr<'T>``
6365
- ``Dictionary<'Key,'T>``

‎docsrc/content/abstraction-monad.fsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ From F#
7474
- ``Result<'T,'U>``
7575
- ``Choice<'T,'U>``
7676
- ``'Monoid * 'T``
77+
- ``struct ('Monoid * 'T)``
7778
- ``Task<'T>``
79+
- ``ValueTask<'T>``
7880
- ``'R->'T``
7981
- ``ResizeArray<'T>``
8082

‎docsrc/content/abstraction-monoid.fsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ From .Net/F#
6060
- ``Tuple<'Monoid1* ... *'MonoidN>``
6161
- ``'Monoid1* ... *'MonoidN``
6262
- ``Task<'T>``
63+
- ``ValueTask<'T>``
6364
- ``'T->'Monoid``
6465
- ``Async<'T>``
6566
- ``Expr<'T>``

0 commit comments

Comments
 (0)