Skip to content

Commit 28be28b

Browse files
eulerfxeulerfx
authored
Merge pull request #72 from eulerfx/netstandard
Netstandard
2 parents 4d4bd75 + 83e097c commit 28be28b

25 files changed

+2261
-479
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ release.sh
180180
localpackages/
181181
paket-files
182182
*.orig
183-
.paket/paket.exe
184183
docs/content/license.md
185184
docs/content/release-notes.md
186185
.fake

‎.paket/Paket.Restore.targets‎

Lines changed: 265 additions & 0 deletions
Large diffs are not rendered by default.

‎.paket/paket.bootstrapper.exe‎

26 KB
Binary file not shown.

‎.paket/paket.exe‎

7.91 MB
Binary file not shown.

‎.paket/paket.targets‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
language: csharp
22

3-
mono:
4-
- latest
5-
- 4.0.5
6-
7-
sudo: false # use the new container-based Travis infrastructure
3+
matrix:
4+
include:
5+
- os: linux # Ubuntu 14.04
6+
dist: trusty
7+
sudo: required
8+
dotnet: 2.0.0
9+
- os: osx # OSX 10.12
10+
osx_image: xcode9.1
11+
dotnet: 2.0.0
12+
dist: trusty
13+
sudo: required
814

915
script:
1016
- ./build.sh All
17+
18+
branches:
19+
except:
20+
- gh-pages

‎FSharp.Control.AsyncSeq.sln‎

Lines changed: 50 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 14
3-
VisualStudioVersion = 14.0.24720.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.27004.2006
4+
MinimumVisualStudioVersion = 15.0.26124.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B98-5CED-492C-A5B7-A5B4F73CF142}"
66
ProjectSection(SolutionItems) = preProject
77
paket.dependencies = paket.dependencies
88
paket.lock = paket.lock
99
EndProjectSection
1010
EndProject
11-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
12-
EndProject
13-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq", "src\FSharp.Control.AsyncSeq\FSharp.Control.AsyncSeq.fsproj", "{2D4F3D0E-0E18-48D7-9C27-98864039393D}"
14-
EndProject
1511
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
1612
ProjectSection(SolutionItems) = preProject
1713
build.fsx = build.fsx
@@ -20,56 +16,77 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60
2016
RELEASE_NOTES.md = RELEASE_NOTES.md
2117
EndProjectSection
2218
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175-43B1-4C90-A1EE-8E351C33435D}"
24-
ProjectSection(SolutionItems) = preProject
25-
docs\tools\generate.fsx = docs\tools\generate.fsx
26-
docs\tools\templates\template.cshtml = docs\tools\templates\template.cshtml
27-
EndProjectSection
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
2820
EndProject
2921
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D5255-776D-4B61-85F9-73C37AA1FB9A}"
3022
ProjectSection(SolutionItems) = preProject
3123
docs\content\index.md = docs\content\index.md
3224
docs\content\terminology.md = docs\content\terminology.md
3325
EndProjectSection
3426
EndProject
35-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
36-
EndProject
37-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq.Tests", "tests\FSharp.Control.AsyncSeq.Tests\FSharp.Control.AsyncSeq.Tests.fsproj", "{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}"
38-
EndProject
3927
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "library", "library", "{B4BB88FA-DB8C-4651-9869-A8FEA79F044E}"
4028
ProjectSection(SolutionItems) = preProject
4129
docs\content\library\AsyncSeq.fsx = docs\content\library\AsyncSeq.fsx
4230
docs\content\library\AsyncSeqExamples.fsx = docs\content\library\AsyncSeqExamples.fsx
4331
EndProjectSection
4432
EndProject
45-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq.Profile7", "src\FSharp.Control.AsyncSeq.Profile7\FSharp.Control.AsyncSeq.Profile7.fsproj", "{114DCF3C-D7CC-4E53-AFF0-AFBFC0C8B966}"
33+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175-43B1-4C90-A1EE-8E351C33435D}"
34+
ProjectSection(SolutionItems) = preProject
35+
docs\tools\generate.fsx = docs\tools\generate.fsx
36+
docs\tools\templates\template.cshtml = docs\tools\templates\template.cshtml
37+
EndProjectSection
38+
EndProject
39+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{86625A13-D7E2-4EAD-B13A-4F37BD89DE2A}"
40+
EndProject
41+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq", "src\FSharp.Control.AsyncSeq\FSharp.Control.AsyncSeq.fsproj", "{DBDF64C3-BE92-4272-8737-5001C469D9AA}"
42+
EndProject
43+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{561B2DD4-BBFB-4E0D-BF73-C10A3E42507C}"
44+
EndProject
45+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.AsyncSeq.Tests", "tests\FSharp.Control.AsyncSeq.Tests\FSharp.Control.AsyncSeq.Tests.fsproj", "{F2404B35-0DAD-483D-9406-7C763CDDC029}"
4646
EndProject
4747
Global
4848
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4949
Debug|Any CPU = Debug|Any CPU
50+
Debug|x64 = Debug|x64
51+
Debug|x86 = Debug|x86
5052
Release|Any CPU = Release|Any CPU
53+
Release|x64 = Release|x64
54+
Release|x86 = Release|x86
5155
EndGlobalSection
5256
GlobalSection(ProjectConfigurationPlatforms) = postSolution
53-
{2D4F3D0E-0E18-48D7-9C27-98864039393D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{2D4F3D0E-0E18-48D7-9C27-98864039393D}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{2D4F3D0E-0E18-48D7-9C27-98864039393D}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{2D4F3D0E-0E18-48D7-9C27-98864039393D}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{ADBD32DB-B7AC-4E81-9507-28F329AF23E7}.Release|Any CPU.Build.0 = Release|Any CPU
61-
{114DCF3C-D7CC-4E53-AFF0-AFBFC0C8B966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62-
{114DCF3C-D7CC-4E53-AFF0-AFBFC0C8B966}.Debug|Any CPU.Build.0 = Debug|Any CPU
63-
{114DCF3C-D7CC-4E53-AFF0-AFBFC0C8B966}.Release|Any CPU.ActiveCfg = Release|Any CPU
64-
{114DCF3C-D7CC-4E53-AFF0-AFBFC0C8B966}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Debug|x64.ActiveCfg = Debug|Any CPU
60+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Debug|x64.Build.0 = Debug|Any CPU
61+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Debug|x86.ActiveCfg = Debug|Any CPU
62+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Debug|x86.Build.0 = Debug|Any CPU
63+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Release|x64.ActiveCfg = Release|Any CPU
66+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Release|x64.Build.0 = Release|Any CPU
67+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Release|x86.ActiveCfg = Release|Any CPU
68+
{DBDF64C3-BE92-4272-8737-5001C469D9AA}.Release|x86.Build.0 = Release|Any CPU
69+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Debug|Any CPU.Build.0 = Debug|Any CPU
71+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Debug|x64.ActiveCfg = Debug|Any CPU
72+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Debug|x64.Build.0 = Debug|Any CPU
73+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Debug|x86.ActiveCfg = Debug|Any CPU
74+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Debug|x86.Build.0 = Debug|Any CPU
75+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|Any CPU.ActiveCfg = Release|Any CPU
76+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x64.ActiveCfg = Release|Any CPU
78+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x64.Build.0 = Release|Any CPU
79+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x86.ActiveCfg = Release|Any CPU
80+
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x86.Build.0 = Release|Any CPU
6581
EndGlobalSection
6682
GlobalSection(SolutionProperties) = preSolution
6783
HideSolutionNode = FALSE
6884
EndGlobalSection
6985
GlobalSection(NestedProjects) = preSolution
70-
{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
71-
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
72-
{ADBD32DB-B7AC-4E81-9507-28F329AF23E7} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
73-
{B4BB88FA-DB8C-4651-9869-A8FEA79F044E} = {8E6D5255-776D-4B61-85F9-73C37AA1FB9A}
86+
{DBDF64C3-BE92-4272-8737-5001C469D9AA} = {86625A13-D7E2-4EAD-B13A-4F37BD89DE2A}
87+
{F2404B35-0DAD-483D-9406-7C763CDDC029} = {561B2DD4-BBFB-4E0D-BF73-C10A3E42507C}
88+
EndGlobalSection
89+
GlobalSection(ExtensibilityGlobals) = postSolution
90+
SolutionGuid = {C565CD17-B9B2-4A58-8F33-07C65FE2D9C3}
7491
EndGlobalSection
7592
EndGlobal

‎RELEASE_NOTES.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 2.0.19-alpha01 - 22.12.2017
2+
* Target .NET Standard
3+
14
### 2.0.18 - 14.12.2017
25
* AsyncSeq.mergeAll min-max fairness
36

‎appveyor.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
environment:
2+
CLI_VERSION: 2.0.0
3+
image: Visual Studio 2017
14
init:
25
- git config --global core.autocrlf input
36
build_script:

‎build.cmd‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
@echo off
22
cls
33

4-
.paket\paket.bootstrapper.exe
5-
if errorlevel 1 (
6-
exit /b %errorlevel%
7-
)
8-
94
.paket\paket.exe restore
105
if errorlevel 1 (
116
exit /b %errorlevel%
127
)
138

149
IF NOT EXIST build.fsx (
1510
.paket\paket.exe update
16-
packages\FAKE\tools\FAKE.exe init.fsx
11+
packages\build\FAKE\tools\FAKE.exe init.fsx
1712
)
18-
packages\FAKE\tools\FAKE.exe build.fsx %*
13+
packages\build\FAKE\tools\FAKE.exe build.fsx %*

0 commit comments

Comments
 (0)