Skip to content

Commit 4ca6b8b

Browse files
gustygusty
authored
Merge branch 'master' into gusty-dict-applicative
2 parents 3407b81 + 492eb7a commit 4ca6b8b

File tree

129 files changed

+6063
-3965
lines changed

Some content is hidden

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

129 files changed

+6063
-3965
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
"commands": [
1414
"fsdocs"
1515
]
16+
},
17+
"fable": {
18+
"version": "3.1.15",
19+
"commands": [
20+
"fable"
21+
]
1622
}
1723
}
1824
}

‎.github/workflows/dotnetcore.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ jobs:
1616
- name: Setup .NET Core
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 3.1.101
19+
dotnet-version: 5.0.100
2020
- name: Restore
2121
run: git submodule update --init --recursive
2222
- name: Build with dotnet
2323
run: dotnet build build.proj --configuration Release
2424
- name: Test with dotnet
2525
run: dotnet test build.proj -v n
26-
- name: Use Node.js
27-
uses: actions/setup-node@v1
28-
with:
29-
node-version: '12.x'
30-
- run: npm install -g fable-splitter fable-compiler
31-
- run: cd src/FSharpPlus; npx fable-splitter --allFiles
32-
- run: cd tests/FSharpPlusFable.Tests; npm install; npm run buildFSharpPlus; npm run test

‎.github/workflows/fable.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Fable
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
10+
jobs:
11+
testfable3:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 5.0.100
20+
- name: Restore
21+
run: git submodule update --init --recursive
22+
- name: Restore tools
23+
run: dotnet tool restore
24+
- name: Use Node.js
25+
uses: actions/setup-node@v1
26+
with:
27+
node-version: '12.x'
28+
- name: Install npm dependencies
29+
working-directory: tests/FSharpPlusFable.Tests
30+
run: npm install
31+
- name: Run Fable tests
32+
working-directory: tests/FSharpPlusFable.Tests
33+
run: dotnet fable . --outDir bin --runScript ./bin
34+
35+
testFable3SubsetOnCore:
36+
runs-on: ubuntu-latest
37+
38+
steps:
39+
- uses: actions/checkout@v2
40+
- name: Setup .NET Core
41+
uses: actions/setup-dotnet@v1
42+
with:
43+
dotnet-version: 5.0.100
44+
- name: Restore
45+
run: git submodule update --init --recursive
46+
- name: Restore tools
47+
run: dotnet tool restore
48+
- name: Run tests (Fable2 subset but on .net)
49+
working-directory: tests/FSharpPlusFable.Tests
50+
run: dotnet run -c Fable
51+
- name: Run tests (Fable3 subset but on .net)
52+
working-directory: tests/FSharpPlusFable.Tests
53+
run: dotnet run -c Fable3
54+
- name: Run tests (Full subset for of tests .net)
55+
working-directory: tests/FSharpPlusFable.Tests
56+
run: dotnet run -c Release

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,4 @@ tests/FSharpPlusFable.Tests/node_modules/
212212
# Fable compilation files
213213
tests/FSharpPlusFable.Tests/FSharpPlusFable
214214
/node_modules
215+
*.fs.js

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: csharp
2-
dotnet: 3.1.101
2+
dotnet: 5.0.100
33

44
sudo: false # use the new container-based Travis infrastructure
55

@@ -8,6 +8,7 @@ script:
88
- dotnet build -c Release ./FSharpPlus.sln
99
- dotnet test -c Release tests/FSharpPlus.Tests
1010
- ./docsrc/tools/download_nugets.sh
11+
- sudo apt-get install -y dotnet-sdk-3.1 # F# Formatting
1112
- dotnet run -c Release --project ./docsrc/tools
1213

1314
env:

‎FSharpPlus.sln‎

Lines changed: 41 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VisualStudioVersion = 16.0.29709.97
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
66
EndProject
7-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpPlus", "src\FSharpPlus\FSharpPlus.fsproj", "{1368368E-D2F4-4FEF-BB2F-492E05156E0F}"
7+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus", "src\FSharpPlus\FSharpPlus.fsproj", "{1368368E-D2F4-4FEF-BB2F-492E05156E0F}"
88
EndProject
99
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
1010
ProjectSection(SolutionItems) = preProject
@@ -81,104 +81,83 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
8181
EndProject
8282
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
8383
EndProject
84-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpPlus.Tests", "tests\FSharpPlus.Tests\FSharpPlus.Tests.fsproj", "{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}"
84+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.Tests", "tests\FSharpPlus.Tests\FSharpPlus.Tests.fsproj", "{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}"
8585
EndProject
8686
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{81F5F559-FD23-4E90-9EE6-3E2A2C1A7F96}"
8787
EndProject
88-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpPlus.Docs", "src\FSharpPlus.Docs\FSharpPlus.Docs.fsproj", "{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}"
88+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.Docs", "src\FSharpPlus.Docs\FSharpPlus.Docs.fsproj", "{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}"
8989
EndProject
90-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.TypeLevel", "src\FSharpPlus\TypeLevel\FSharpPlus.TypeLevel.fsproj", "{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}"
90+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.TypeLevel", "src\FSharpPlus.TypeLevel\FSharpPlus.TypeLevel.fsproj", "{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}"
9191
EndProject
92-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.Providers", "src\FSharpPlus\Providers\FSharpPlus.Providers.fsproj", "{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}"
92+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlus.Providers", "src\FSharpPlus.TypeLevel\Providers\FSharpPlus.Providers.fsproj", "{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}"
9393
EndProject
9494
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpLib", "tests\CSharpLib\CSharpLib.csproj", "{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}"
9595
EndProject
96+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPlusFable.Tests", "tests\FSharpPlusFable.Tests\FSharpPlusFable.Tests.fsproj", "{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}"
97+
EndProject
9698
Global
9799
GlobalSection(SolutionConfigurationPlatforms) = preSolution
98100
Debug|Any CPU = Debug|Any CPU
99-
Debug|x64 = Debug|x64
100-
Debug|x86 = Debug|x86
101101
Release|Any CPU = Release|Any CPU
102-
Release|x64 = Release|x64
103-
Release|x86 = Release|x86
102+
Fable|Any CPU = Fable|Any CPU
103+
Fable3|Any CPU = Fable3|Any CPU
104104
EndGlobalSection
105105
GlobalSection(ProjectConfigurationPlatforms) = postSolution
106106
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107107
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
108-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Debug|x64.ActiveCfg = Debug|Any CPU
109-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Debug|x64.Build.0 = Debug|Any CPU
110-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Debug|x86.ActiveCfg = Debug|Any CPU
111-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Debug|x86.Build.0 = Debug|Any CPU
112108
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
113109
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Release|x64.ActiveCfg = Release|Any CPU
115-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Release|x64.Build.0 = Release|Any CPU
116-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Release|x86.ActiveCfg = Release|Any CPU
117-
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Release|x86.Build.0 = Release|Any CPU
110+
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
111+
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Fable|Any CPU.Build.0 = Fable|Any CPU
112+
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
113+
{1368368E-D2F4-4FEF-BB2F-492E05156E0F}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
118114
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119115
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
120-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|x64.ActiveCfg = Debug|Any CPU
121-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|x64.Build.0 = Debug|Any CPU
122-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|x86.ActiveCfg = Debug|Any CPU
123-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Debug|x86.Build.0 = Debug|Any CPU
124116
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
125117
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|Any CPU.Build.0 = Release|Any CPU
126-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|x64.ActiveCfg = Release|Any CPU
127-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|x64.Build.0 = Release|Any CPU
128-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|x86.ActiveCfg = Release|Any CPU
129-
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Release|x86.Build.0 = Release|Any CPU
118+
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
119+
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Fable|Any CPU.Build.0 = Fable|Any CPU
120+
{FED64B0A-3FD7-4357-98B6-0B01A3A26EC7}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
130121
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131122
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
132-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|x64.ActiveCfg = Debug|Any CPU
133-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|x64.Build.0 = Debug|Any CPU
134-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|x86.ActiveCfg = Debug|Any CPU
135-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Debug|x86.Build.0 = Debug|Any CPU
136123
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
137124
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|Any CPU.Build.0 = Release|Any CPU
138-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x64.ActiveCfg = Release|x64
139-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x64.Build.0 = Release|x64
140-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x86.ActiveCfg = Release|x86
141-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x86.Build.0 = Release|x86
125+
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
126+
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable|Any CPU.Build.0 = Fable|Any CPU
127+
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
128+
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
142129
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143130
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|Any CPU.Build.0 = Debug|Any CPU
144131
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.ActiveCfg = Release|Any CPU
145132
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|Any CPU.Build.0 = Release|Any CPU
146-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x64.ActiveCfg = Debug|Any CPU
147-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x64.Build.0 = Debug|Any CPU
148-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x86.ActiveCfg = Debug|Any CPU
149-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Debug|x86.Build.0 = Debug|Any CPU
150-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x64.ActiveCfg = Release|Any CPU
151-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x64.Build.0 = Release|Any CPU
152-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x86.ActiveCfg = Release|Any CPU
153-
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Release|x86.Build.0 = Release|Any CPU
154-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x64.ActiveCfg = Release|Any CPU
155-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x64.Build.0 = Release|Any CPU
156-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x86.ActiveCfg = Release|Any CPU
157-
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF}.Release|x86.Build.0 = Release|Any CPU
133+
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
134+
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable|Any CPU.Build.0 = Fable|Any CPU
135+
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
136+
{AFB80E42-3D22-4C38-B51E-27E9FA4D8111}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
158137
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159138
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
160-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|x64.ActiveCfg = Debug|Any CPU
161-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|x64.Build.0 = Debug|Any CPU
162-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|x86.ActiveCfg = Debug|Any CPU
163-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Debug|x86.Build.0 = Debug|Any CPU
164139
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
165140
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|Any CPU.Build.0 = Release|Any CPU
166-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x64.ActiveCfg = Release|Any CPU
167-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x64.Build.0 = Release|Any CPU
168-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x86.ActiveCfg = Release|Any CPU
169-
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Release|x86.Build.0 = Release|Any CPU
141+
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
142+
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable|Any CPU.Build.0 = Fable|Any CPU
143+
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
144+
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
170145
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
171146
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
172-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|x64.ActiveCfg = Debug|Any CPU
173-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|x64.Build.0 = Debug|Any CPU
174-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|x86.ActiveCfg = Debug|Any CPU
175-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Debug|x86.Build.0 = Debug|Any CPU
176147
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
177148
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|Any CPU.Build.0 = Release|Any CPU
178-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|x64.ActiveCfg = Release|Any CPU
179-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|x64.Build.0 = Release|Any CPU
180-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|x86.ActiveCfg = Release|Any CPU
181-
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Release|x86.Build.0 = Release|Any CPU
149+
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
150+
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable|Any CPU.Build.0 = Fable|Any CPU
151+
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
152+
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
153+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
155+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
156+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Release|Any CPU.Build.0 = Release|Any CPU
157+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Fable|Any CPU.ActiveCfg = Fable|Any CPU
158+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Fable|Any CPU.Build.0 = Fable|Any CPU
159+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Fable3|Any CPU.ActiveCfg = Fable3|Any CPU
160+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83}.Fable3|Any CPU.Build.0 = Fable3|Any CPU
182161
EndGlobalSection
183162
GlobalSection(SolutionProperties) = preSolution
184163
HideSolutionNode = FALSE
@@ -190,6 +169,7 @@ Global
190169
{B725BEFA-524E-4FD8-BFFF-4AEBCD03D8CF} = {81F5F559-FD23-4E90-9EE6-3E2A2C1A7F96}
191170
{9B93F5E5-3D53-42F1-96E2-06E6A7B496A0} = {81F5F559-FD23-4E90-9EE6-3E2A2C1A7F96}
192171
{7A5B766E-8141-4D8A-B3EB-91422FDBDF71} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
172+
{1CCD1BFB-60E4-40AA-B534-3C5EEE5E1E83} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
193173
EndGlobalSection
194174
GlobalSection(ExtensibilityGlobals) = postSolution
195175
SolutionGuid = {789B5FFA-7891-4F60-831E-42C3C5ED2C51}

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# FSharpPlus
22

3-
[![Build Status](https://api.travis-ci.org/fsprojects/FSharpPlus.svg?branch=master)](https://travis-ci.org/fsprojects/FSharpPlus)
43
[![Build Status](https://ci.appveyor.com/api/projects/status/25ukpc0lamyf7pdx/branch/master?svg=true)](https://ci.appveyor.com/project/wallymathieu/fsharpplus/branch/master)
54
[![Download](https://img.shields.io/nuget/dt/FSharpPlus.svg)](https://www.nuget.org/packages/FSharpPlus)
65
[![NuGet](https://img.shields.io/nuget/v/FSharpPlus.svg)](https://www.nuget.org/packages/FSharpPlus)

‎RELEASE_NOTES.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
#### 1.1.5 - November 22 2020
1+
#### 1.1.7 - January 7 2021
2+
- Fix short-circuiting Traverse
3+
4+
#### 1.1.6 - December 7 2020
5+
- Fix signature of Free.fold
6+
- Update Task extensions so they can handle short-circuit, exceptions and cancellations
7+
- Fix String.drop function
28

9+
#### 1.1.5 - November 22 2020
310
- Use list internally instead of array for the generic implementation of sequence
411
- Make `<*>` for functions evaluate side-effects left-to-right
512
- Remove BindReturn from monad computation expression in order to avoid type inference issues in F#5
613

714
#### 1.1.4 - October 7 2020
8-
915
- Fix: `TryWith` for State and Reader, `Filter`, `DistinctBy`, `SortBy` and `SortByAscending` for user defined types.
1016
- Compile-time safety for try-blocks and while-loops in generic computation expressions.
1117
- Reduce allocations in NonEmptyList builder implementation.
@@ -232,4 +238,4 @@
232238
* Generalize Unzip to any functor
233239

234240
#### 1.0.0-CI00063 - December 26 2016
235-
* Initial release using ProjectScaffold
241+
* Initial release using ProjectScaffold

‎appveyor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ before_build:
1111
init:
1212
- git config --global core.autocrlf input
1313
install:
14-
- git submodule update --init --recursive
14+
- cmd: choco install dotnetcore-sdk -y
15+
- cmd: git submodule update --init --recursive
1516
build_script:
1617
- cmd: dotnet restore ./FSharpPlus.sln
1718
- cmd: dotnet build -c Release ./FSharpPlus.sln

‎build.proj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
</Target>
99

1010
<Target Name="Pack">
11-
<Exec Command='dotnet build src/FSharpPlus/Providers -c Release --version-suffix "$(VersionSuffix)" ' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
11+
<Exec Command='dotnet build src/FSharpPlus.TypeLevel/Providers -c Release --version-suffix "$(VersionSuffix)" ' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
1212
<Exec Command='dotnet pack src/FSharpPlus -c Release -o "$(NupkgsDir)" --version-suffix "$(VersionSuffix)" ' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
13+
<Exec Command='dotnet pack src/FSharpPlus.TypeLevel -c Release -o "$(NupkgsDir)" --version-suffix "$(VersionSuffix)" ' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
1314
</Target>
1415

1516
<Target Name="Test">
16-
<Exec Command='dotnet build src/FSharpPlus/TypeLevel' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
17+
<Exec Command='dotnet build src/FSharpPlus.TypeLevel' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
1718
<Exec Command='dotnet test tests/FSharpPlus.Tests -c Release --logger:trx' WorkingDirectory="$(RepoRootDir)" IgnoreStandardErrorWarningFormat="true" />
1819
</Target>
1920

0 commit comments

Comments
 (0)