Skip to content

Commit ee6ba78

Browse files
dsymedsyme
committed
rename to FSharpx.Extras and modernize
1 parent acd23f0 commit ee6ba78

60 files changed

Lines changed: 121 additions & 427 deletions

Some content is hidden

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

‎FSharpx.Core.Tests/AwaitObservableTests.fs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ open System
44
open System.Threading
55
open System.Threading.Tasks
66

7-
open FSharpx.Control.Observable
8-
97
open FsUnit
108
open NUnit.Framework
9+
open FSharpx.Control
10+
open FSharpx.Control.AsyncExtensions
11+
open FSharpx.Control.StreamReaderExtensions
12+
open FSharpx.Control.Observable
1113

1214
[<TestFixture>]
1315
type ``AwaitObservable Tests``() =
@@ -26,7 +28,7 @@ type ``AwaitObservable Tests``() =
2628
[<Test; Ignore("Failing on appveyor ('A continuation provided by Async.FromContinuations was invoked multiple times')") >]
2729
member test.``AwaitObservable yields the first value from the sources Next``() =
2830
let source = new ObservableMock<string>()
29-
let wf = Async.AwaitObservable source
31+
let wf = Async .AwaitObservable source
3032
let awaiter = startAsAwaiter wf
3133
source.AssertSubscribtion(TimeSpan.FromSeconds(1.0))
3234
source.Next("ONE")

‎FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@
4949
</PropertyGroup>
5050
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5151
<ItemGroup>
52+
<Reference Include="FSharp.Control.AsyncSeq">
53+
<HintPath>..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
54+
<Private>True</Private>
55+
</Reference>
56+
<Reference Include="FSharpx.Async">
57+
<HintPath>..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
5260
<Reference Include="FSharpx.Collections">
5361
<HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
5462
<Private>True</Private>

‎FSharpx.Core.Tests/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.1.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎FSharpx.Core.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="FSharp.Control.AsyncSeq" version="1.15.0" targetFramework="net40" />
4+
<package id="FSharpx.Async" version="1.12.0" targetFramework="net40" />
35
<package id="FSharpx.Collections" version="1.9.4" targetFramework="net40" />
46
<package id="FsUnit" version="1.2.1.0" targetFramework="net40" />
57
<package id="NUnit" version="2.6.2" targetFramework="net40" />

‎FSharpx.sln‎

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30501.0
3+
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}"
66
ProjectSection(SolutionItems) = preProject
@@ -39,14 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{EFB3
3939
docs\content\WebProxy.fsx = docs\content\WebProxy.fsx
4040
EndProjectSection
4141
EndProject
42-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Http", "src\FSharpx.Http\FSharpx.Http.fsproj", "{60F3BB81-5449-45DD-A217-B6045327680C}"
43-
EndProject
44-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Http.Tests", "tests\FSharpx.Http.Tests\FSharpx.Http.Tests.fsproj", "{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}"
45-
EndProject
46-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Observable", "src\FSharpx.Observable\FSharpx.Observable.fsproj", "{2E802F54-9CD0-4B0A-B834-5C5979403B50}"
47-
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpx.Observable.Tests", "tests\FSharpx.Observable.Tests\FSharpx.Observable.Tests.csproj", "{13CF1E8D-D712-4031-8EEF-414534CC234E}"
49-
EndProject
5042
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{04FE33E9-D53A-4703-B86B-C84B64958D19}"
5143
ProjectSection(SolutionItems) = preProject
5244
.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -119,65 +111,6 @@ Global
119111
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
120112
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
121113
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|x86.ActiveCfg = Release|Any CPU
122-
{60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
123-
{60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
124-
{60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
125-
{60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
126-
{60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|x86.ActiveCfg = Debug|Any CPU
127-
{60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128-
{60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Any CPU.Build.0 = Debug|Any CPU
129-
{60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
130-
{60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
131-
{60F3BB81-5449-45DD-A217-B6045327680C}.Debug|x86.ActiveCfg = Debug|Any CPU
132-
{60F3BB81-5449-45DD-A217-B6045327680C}.Release|Any CPU.ActiveCfg = Release|Any CPU
133-
{60F3BB81-5449-45DD-A217-B6045327680C}.Release|Any CPU.Build.0 = Release|Any CPU
134-
{60F3BB81-5449-45DD-A217-B6045327680C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
135-
{60F3BB81-5449-45DD-A217-B6045327680C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
136-
{60F3BB81-5449-45DD-A217-B6045327680C}.Release|x86.ActiveCfg = Release|Any CPU
137-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
138-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
139-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
140-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
141-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|x86.ActiveCfg = Debug|Any CPU
142-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
144-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
145-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
146-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|x86.ActiveCfg = Debug|Any CPU
147-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
148-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Any CPU.Build.0 = Release|Any CPU
149-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
150-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
151-
{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|x86.ActiveCfg = Release|Any CPU
152-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
153-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
154-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
155-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
156-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|x86.ActiveCfg = Debug|Any CPU
157-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Any CPU.Build.0 = Debug|Any CPU
159-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
160-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
161-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|x86.ActiveCfg = Debug|Any CPU
162-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Any CPU.ActiveCfg = Release|Any CPU
163-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Any CPU.Build.0 = Release|Any CPU
164-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
165-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Mixed Platforms.Build.0 = Release|Any CPU
166-
{2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|x86.ActiveCfg = Release|Any CPU
167-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|Any CPU.ActiveCfg = DataStructures|Any CPU
168-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|Any CPU.Build.0 = DataStructures|Any CPU
169-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|Mixed Platforms.ActiveCfg = DataStructures|Any CPU
170-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|x86.ActiveCfg = DataStructures|Any CPU
171-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
172-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Any CPU.Build.0 = Debug|Any CPU
173-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
174-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
175-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|x86.ActiveCfg = Debug|Any CPU
176-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Any CPU.ActiveCfg = Release|Any CPU
177-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Any CPU.Build.0 = Release|Any CPU
178-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
179-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
180-
{13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|x86.ActiveCfg = Release|Any CPU
181114
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
182115
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
183116
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU

‎build.fsx‎

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ RestorePackage()
1515

1616
// properties
1717
let currentDate = System.DateTime.UtcNow
18-
let projectName = "FSharpx"
18+
let projectName = "FSharpx.Extras"
1919

20-
let coreSummary = "FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library."
21-
let projectSummary = "FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library."
20+
let coreSummary = "FSharpx.Extras is a library for the .NET platform implementing general functional constructs on top of the F# core library."
21+
let projectSummary = "FSharpx.Extras is a library for the .NET platform implementing general functional constructs on top of the F# core library."
2222
let authors = ["Steffen Forkmann"; "Daniel Mohl"; "Tomas Petricek"; "Ryan Riley"; "Mauricio Scheffer"; "Phil Trelford" ]
2323
let mail = "ryan.riley@panesofglass.org"
24-
let homepage = "http://github.com/fsprojects/fsharpx"
24+
let homepage = "http://github.com/fsprojects/FSharpx.Extras"
2525

2626
// .NET Frameworks
2727
let net35 = "v3.5"
@@ -38,13 +38,11 @@ let nugDir = "./nuget"
3838
let nugetDir package = nugDir @@ package
3939
let nugetLibDir package = nugetDir package @@ "lib"
4040

41-
let packages = ["Core"; "Http"; "Observable"; "Text.StructuredFormat"]
41+
let packages = ["Extras"; "Text.StructuredFormat"]
4242

43-
let projectDesc = "FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible."
43+
let projectDesc = "FSharpx.Extras implements general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible."
4444

4545
let rec getPackageDesc = function
46-
| "Http" -> projectDesc + "\r\n\r\nThis library provides common features for working with HTTP applications."
47-
| "Observable" -> projectDesc + "\r\n\r\nThis library implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford."
4846
| "Text.StructuredFormat" -> projectDesc + "\r\n\r\nThis library provides data structures and functoins for pretty printers."
4947
| _ -> projectDesc + "\r\n\r\nIt currently implements:\r\n\r\n" +
5048
"* Several standard monads: State, Reader, Writer, Either, Continuation, Distribution\r\n" +
@@ -58,7 +56,7 @@ let rec getPackageDesc = function
5856
let gitHome = "https://github.com/fsprojects"
5957

6058
// The name of the project on GitHub
61-
let gitName = "fsharpx"
59+
let gitName = "FSharpx.Extras"
6260

6361
// The url for the raw files hosted
6462
let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects"
@@ -94,27 +92,10 @@ Target "AssemblyInfo" (fun _ ->
9492
CodeLanguage = FSharp
9593
AssemblyVersion = release.AssemblyVersion
9694
AssemblyTitle = projectName
97-
AssemblyDescription = getPackageDesc "Core"
95+
AssemblyDescription = getPackageDesc "Extras"
9896
Guid = "1e95a279-c2a9-498b-bc72-6e7a0d6854ce"
99-
OutputFileName = "./src/FSharpx.Core/AssemblyInfo.fs" })
97+
OutputFileName = "./src/FSharpx.Extras/AssemblyInfo.fs" })
10098

101-
AssemblyInfo (fun p ->
102-
{p with
103-
CodeLanguage = FSharp
104-
AssemblyVersion = release.AssemblyVersion
105-
AssemblyTitle = "FSharpx.Http"
106-
AssemblyDescription = getPackageDesc "Http"
107-
Guid = "60F3BB81-5449-45DD-A217-B6045327680C"
108-
OutputFileName = "./src/FSharpx.Http/AssemblyInfo.fs" })
109-
110-
AssemblyInfo (fun p ->
111-
{p with
112-
CodeLanguage = FSharp
113-
AssemblyVersion = release.AssemblyVersion
114-
AssemblyTitle = "FSharpx.Observable"
115-
AssemblyDescription = getPackageDesc "Observable"
116-
Guid = "2E802F54-9CD0-4B0A-B834-5C5979403B50"
117-
OutputFileName = "./src/FSharpx.Observable/AssemblyInfo.fs" })
11899

119100
AssemblyInfo (fun p ->
120101
{p with
@@ -177,10 +158,10 @@ Target "NuGet" (fun _ ->
177158
Publish = hasBuildParam "nugetkey"
178159
ToolPath = nugetPath
179160
Dependencies =
180-
if package = "Core" then p.Dependencies
161+
if package = "Extras" then p.Dependencies
181162
else
182-
[projectName + ".Core", RequireExactly (NormalizeVersion release.AssemblyVersion)] })
183-
"FSharpx.Core.nuspec")
163+
["FSharpx.Extras", RequireExactly (NormalizeVersion release.AssemblyVersion)] })
164+
"FSharpx.Extras.nuspec")
184165

185166

186167

‎docs/content/index.fsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ FSharpx.Core currently implements:
2020
2121
* Functions to make C# - F# interop easier.
2222
23-
FSharpx.Core is a set of additions on top of FSharpx.Collections
23+
* FSharpx.Http provides a few features for working with HTTP applications.
24+
25+
FSharpx.Core is a set of additions on top of FSharpx.Collections and FSharpx.Async
2426
2527
2628
## Extras
2729
2830
These are some adhoc components which are now rarely used:
2931
30-
* FSharpx.Http provides a few features for working with HTTP applications.
31-
* FSharpx.Observable implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford.
32-
* FSharpx.Text.StructuredFormat provides data structures and functoins for pretty printers.
32+
* FSharpx.Text.StructuredFormat provides data structures and functions for pretty printers.
3333
3434
3535
*)

‎docs/tools/generate.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let githubLink = "https://github.com/fsprojects/fsharpx"
1212

1313
// Specify more information about your project
1414
let info =
15-
[ "project-name", "fsharpx"
15+
[ "project-name", "FSharpx.Functional"
1616
"project-author", "Steffan Forkmann and others"
1717
"project-summary", "Extra components for FSharpx"
1818
"project-github", githubLink

‎src/FSharpx.Core/AssemblyInfo.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59
2020

2121
[<assembly: AssemblyTitle ("FSharpx")>]
2222

23-
[<assembly: AssemblyDescription ("FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
23+
[<assembly: AssemblyDescription ("FSharpx.Core and FSharpx.Functional implement general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible.
2424
2525
It currently implements:
2626

‎src/FSharpx.Core/CSharpCompat.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ open System.IO
55
open System.Net
66
open System.Collections.Generic
77
open System.Runtime.CompilerServices
8-
open FSharpx.Control.StreamReaderExtensions
98
open FSharpx.Collections
9+
open FSharpx.Functional
10+
open FSharpx.Control
1011
open FSharpx
1112

1213

0 commit comments

Comments
 (0)