Skip to content

Commit 71c323a

Browse files
committed
Previous merge changes
1 parent 5a30e3a commit 71c323a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+68
-120
lines changed

FSharpPlus.sln

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpPlus.Docs", "src\FSha
9797
EndProject
9898
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.1", "tests\FSharpPlus.1\FSharpPlus.1.fsproj", "{E63B5896-A063-45CF-9802-67E81C31D846}"
9999
EndProject
100-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.TypeLevel", "src\FSharpPlus.TypeLevel\FSharpPlus.TypeLevel.fsproj", "{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}"
101100
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpPlus.TypeLevel", "src\FSharpPlus.TypeLevel\FSharpPlus.TypeLevel.fsproj", "{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}"
102101
EndProject
103102
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpPlus.Providers", "src\FSharpPlus.TypeLevel\Providers\FSharpPlus.Providers.fsproj", "{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}"
@@ -138,7 +137,6 @@ Global
138137
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
139138
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
140139
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Fable|Any CPU.Build.0 = Fable|Any CPU
141-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
142140
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
143141
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|Any CPU.Build.0 = Release|Any CPU
144142
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Test|Any CPU.ActiveCfg = Test|Any CPU
@@ -147,8 +145,6 @@ Global
147145
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
148146
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
149147
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable|Any CPU.Build.0 = Fable|Any CPU
150-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
151-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
152148
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
153149
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|Any CPU.Build.0 = Release|Any CPU
154150
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Test|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,46 +153,20 @@ Global
157153
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|Any CPU.Build.0 = Debug|Any CPU
158154
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.ActiveCfg = Release|Any CPU
159155
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.Build.0 = Release|Any CPU
160-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x64.ActiveCfg = Debug|Any CPU
161-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x64.Build.0 = Debug|Any CPU
162-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x86.ActiveCfg = Debug|Any CPU
163-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x86.Build.0 = Debug|Any CPU
164-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x64.ActiveCfg = Release|Any CPU
165-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x64.Build.0 = Release|Any CPU
166-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x86.ActiveCfg = Release|Any CPU
167-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x86.Build.0 = Release|Any CPU
168-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x64.ActiveCfg = Release|Any CPU
169-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x64.Build.0 = Release|Any CPU
170-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x86.ActiveCfg = Release|Any CPU
171-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x86.Build.0 = Release|Any CPU
172156
{E63B5896-A063-45CF-9802-67E81C31D846}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173157
{E63B5896-A063-45CF-9802-67E81C31D846}.Debug|Any CPU.Build.0 = Debug|Any CPU
174-
{E63B5896-A063-45CF-9802-67E81C31D846}.Debug|x64.ActiveCfg = Debug|Any CPU
175-
{E63B5896-A063-45CF-9802-67E81C31D846}.Debug|x64.Build.0 = Debug|Any CPU
176-
{E63B5896-A063-45CF-9802-67E81C31D846}.Debug|x86.ActiveCfg = Debug|Any CPU
177-
{E63B5896-A063-45CF-9802-67E81C31D846}.Debug|x86.Build.0 = Debug|Any CPU
178158
{E63B5896-A063-45CF-9802-67E81C31D846}.Release|Any CPU.ActiveCfg = Release|Any CPU
179159
{E63B5896-A063-45CF-9802-67E81C31D846}.Release|Any CPU.Build.0 = Release|Any CPU
180-
{E63B5896-A063-45CF-9802-67E81C31D846}.Release|x64.ActiveCfg = Release|Any CPU
181-
{E63B5896-A063-45CF-9802-67E81C31D846}.Release|x64.Build.0 = Release|Any CPU
182-
{E63B5896-A063-45CF-9802-67E81C31D846}.Release|x86.ActiveCfg = Release|Any CPU
183-
{E63B5896-A063-45CF-9802-67E81C31D846}.Release|x86.Build.0 = Release|Any CPU
160+
{E63B5896-A063-45CF-9802-67E81C31D846}.Test|Any CPU.ActiveCfg = Release|Any CPU
161+
{E63B5896-A063-45CF-9802-67E81C31D846}.Test|Any CPU.Build.0 = Release|Any CPU
184162
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
185163
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable|Any CPU.Build.0 = Fable|Any CPU
186-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
187-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
188164
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
189165
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
190166
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
191167
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|Any CPU.Build.0 = Release|Any CPU
192-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x64.ActiveCfg = Release|Any CPU
193-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x64.Build.0 = Release|Any CPU
194-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x86.ActiveCfg = Release|Any CPU
195-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x86.Build.0 = Release|Any CPU
196168
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
197169
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable|Any CPU.Build.0 = Fable|Any CPU
198-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
199-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
200170
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
201171
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
202172
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -207,16 +177,12 @@ Global
207177
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
208178
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
209179
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable|Any CPU.Build.0 = Fable|Any CPU
210-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
211-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
212180
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213181
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|Any CPU.Build.0 = Debug|Any CPU
214182
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.ActiveCfg = Release|Any CPU
215183
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.Build.0 = Release|Any CPU
216184
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
217185
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable|Any CPU.Build.0 = Fable|Any CPU
218-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
219-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
220186
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.ActiveCfg = Release|Any CPU
221187
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.Build.0 = Release|Any CPU
222188
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Test|Any CPU.ActiveCfg = Release|Any CPU
@@ -225,18 +191,13 @@ Global
225191
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
226192
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
227193
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable|Any CPU.Build.0 = Fable|Any CPU
228-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
229-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
230194
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
231195
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|Any CPU.Build.0 = Release|Any CPU
232196
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Test|Any CPU.ActiveCfg = Release|Any CPU
233197
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Test|Any CPU.Build.0 = Release|Any CPU
234198
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
235199
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
236200
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
237-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable|Any CPU.Build.0 = Fable|Any CPU
238-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
239-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
240201
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
241202
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|Any CPU.Build.0 = Release|Any CPU
242203
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Test|Any CPU.ActiveCfg = Release|Any CPU
@@ -254,17 +215,14 @@ Global
254215
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
255216
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Debug|Any CPU.Build.0 = Debug|Any CPU
256217
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable|Any CPU.ActiveCfg = Debug|Any CPU
257-
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable|Any CPU.Build.0 = Debug|Any CPU
258218
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable3|Any CPU.ActiveCfg = Debug|Any CPU
259-
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Fable3|Any CPU.Build.0 = Debug|Any CPU
260219
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Release|Any CPU.ActiveCfg = Release|Any CPU
261220
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Release|Any CPU.Build.0 = Release|Any CPU
262221
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Test|Any CPU.ActiveCfg = Release|Any CPU
263222
{EEFF08EB-8B0C-4F63-9425-4281EFF12087}.Test|Any CPU.Build.0 = Release|Any CPU
264223
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
265224
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
266225
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable|Any CPU.ActiveCfg = Debug|Any CPU
267-
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable|Any CPU.Build.0 = Debug|Any CPU
268226
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable3|Any CPU.ActiveCfg = Debug|Any CPU
269227
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Fable3|Any CPU.Build.0 = Debug|Any CPU
270228
{ACBBD11E-0746-4B9D-9CED-A90FE5824CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU

docsrc/content/abstraction-alternative.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** hide ***)
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
4-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
4+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
55

66
(**
77
Alternative

docsrc/content/abstraction-applicative.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** hide ***)
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
4-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
4+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
55

66
(**
77
Applicative

docsrc/content/abstraction-bifoldable.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Examples
9494
--------
9595
*)
9696

97-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
97+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
9898

9999
open FSharpPlus
100100
open FSharpPlus.Control

docsrc/content/abstraction-bifunctor.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
44

5-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
5+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
66
(**
77
Bifunctor
88
=======

docsrc/content/abstraction-bitraversable.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** hide ***)
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
4-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
4+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
55

66
(**
77
Bitraversable

docsrc/content/abstraction-comonad.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** hide ***)
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
4-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
4+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
55

66
(**
77
Comonad

docsrc/content/abstraction-contravariant.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** hide ***)
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
4-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
4+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
55

66
(**
77
Contravariant

docsrc/content/abstraction-foldable.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Examples
8181

8282

8383

84-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
84+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
8585

8686
open FSharpPlus
8787
open FSharpPlus.Data

docsrc/content/abstraction-functor.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** hide ***)
22
// This block of code is omitted in the generated HTML documentation. Use
33
// it to define helpers that you do not want to show in the documentation.
4-
#r @"../../src/FSharpPlus/bin/Release/net45/FSharpPlus.dll"
4+
#r @"../../src/FSharpPlus/bin/Release/netstandard2.0/FSharpPlus.dll"
55

66
(**
77
Functor

0 commit comments

Comments
 (0)