diff --git a/FSharpx.Core.Tests/AwaitObservableTests.fs b/FSharpx.Core.Tests/AwaitObservableTests.fs index a72e5764..b5f667ad 100644 --- a/FSharpx.Core.Tests/AwaitObservableTests.fs +++ b/FSharpx.Core.Tests/AwaitObservableTests.fs @@ -4,10 +4,12 @@ open System open System.Threading open System.Threading.Tasks -open FSharpx.Control.Observable - open FsUnit open NUnit.Framework +open FSharpx.Control +open FSharpx.Control.AsyncExtensions +open FSharpx.Control.StreamReaderExtensions +open FSharpx.Control.Observable [] type ``AwaitObservable Tests``() = @@ -26,7 +28,7 @@ type ``AwaitObservable Tests``() = [] member test.``AwaitObservable yields the first value from the sources Next``() = let source = new ObservableMock() - let wf = Async.AwaitObservable source + let wf = Async .AwaitObservable source let awaiter = startAsAwaiter wf source.AssertSubscribtion(TimeSpan.FromSeconds(1.0)) source.Next("ONE") diff --git a/FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj b/FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj index 7f9f3f35..f15747cf 100644 --- a/FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj +++ b/FSharpx.Core.Tests/FSharpx.Core.Tests.fsproj @@ -49,6 +49,14 @@ + + ..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll + True + + + ..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll + True + ..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll True diff --git a/FSharpx.Core.Tests/app.config b/FSharpx.Core.Tests/app.config index ff585b76..d95ace21 100644 --- a/FSharpx.Core.Tests/app.config +++ b/FSharpx.Core.Tests/app.config @@ -4,7 +4,7 @@ - + diff --git a/FSharpx.Core.Tests/packages.config b/FSharpx.Core.Tests/packages.config index 51dd2c00..a6397c3a 100644 --- a/FSharpx.Core.Tests/packages.config +++ b/FSharpx.Core.Tests/packages.config @@ -1,5 +1,7 @@  + + diff --git a/FSharpx.sln b/FSharpx.sln index 3aefbf65..87e193ef 100644 --- a/FSharpx.sln +++ b/FSharpx.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}" ProjectSection(SolutionItems) = preProject @@ -39,14 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{EFB3 docs\content\WebProxy.fsx = docs\content\WebProxy.fsx EndProjectSection EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Http", "src\FSharpx.Http\FSharpx.Http.fsproj", "{60F3BB81-5449-45DD-A217-B6045327680C}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Http.Tests", "tests\FSharpx.Http.Tests\FSharpx.Http.Tests.fsproj", "{3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Observable", "src\FSharpx.Observable\FSharpx.Observable.fsproj", "{2E802F54-9CD0-4B0A-B834-5C5979403B50}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpx.Observable.Tests", "tests\FSharpx.Observable.Tests\FSharpx.Observable.Tests.csproj", "{13CF1E8D-D712-4031-8EEF-414534CC234E}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{04FE33E9-D53A-4703-B86B-C84B64958D19}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config @@ -119,65 +111,6 @@ Global {1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU {1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|x86.ActiveCfg = Release|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Any CPU.Build.0 = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.DataStructures|x86.ActiveCfg = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Debug|x86.ActiveCfg = Debug|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Release|Any CPU.Build.0 = Release|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {60F3BB81-5449-45DD-A217-B6045327680C}.Release|x86.ActiveCfg = Release|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Any CPU.Build.0 = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.DataStructures|x86.ActiveCfg = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Debug|x86.ActiveCfg = Debug|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Any CPU.Build.0 = Release|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3D1FCA4C-757E-4AD0-9E4B-4101C8AFCCA4}.Release|x86.ActiveCfg = Release|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Any CPU.Build.0 = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.DataStructures|x86.ActiveCfg = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Any CPU.Build.0 = Release|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2E802F54-9CD0-4B0A-B834-5C5979403B50}.Release|x86.ActiveCfg = Release|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|Any CPU.ActiveCfg = DataStructures|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|Any CPU.Build.0 = DataStructures|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|Mixed Platforms.ActiveCfg = DataStructures|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.DataStructures|x86.ActiveCfg = DataStructures|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Debug|x86.ActiveCfg = Debug|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Any CPU.Build.0 = Release|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {13CF1E8D-D712-4031-8EEF-414534CC234E}.Release|x86.ActiveCfg = Release|Any CPU {AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU {AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.Build.0 = Debug|Any CPU {AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/build.fsx b/build.fsx index 7d83b409..63b10164 100644 --- a/build.fsx +++ b/build.fsx @@ -15,13 +15,13 @@ RestorePackage() // properties let currentDate = System.DateTime.UtcNow -let projectName = "FSharpx" +let projectName = "FSharpx.Extras" -let coreSummary = "FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library." -let projectSummary = "FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library." +let coreSummary = "FSharpx.Extras is a library for the .NET platform implementing general functional constructs on top of the F# core library." +let projectSummary = "FSharpx.Extras is a library for the .NET platform implementing general functional constructs on top of the F# core library." let authors = ["Steffen Forkmann"; "Daniel Mohl"; "Tomas Petricek"; "Ryan Riley"; "Mauricio Scheffer"; "Phil Trelford" ] let mail = "ryan.riley@panesofglass.org" -let homepage = "http://github.com/fsprojects/fsharpx" +let homepage = "http://github.com/fsprojects/FSharpx.Extras" // .NET Frameworks let net35 = "v3.5" @@ -38,13 +38,11 @@ let nugDir = "./nuget" let nugetDir package = nugDir @@ package let nugetLibDir package = nugetDir package @@ "lib" -let packages = ["Core"; "Http"; "Observable"; "Text.StructuredFormat"] +let packages = ["Extras"; "Text.StructuredFormat"] -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." +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." let rec getPackageDesc = function -| "Http" -> projectDesc + "\r\n\r\nThis library provides common features for working with HTTP applications." -| "Observable" -> projectDesc + "\r\n\r\nThis library implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford." | "Text.StructuredFormat" -> projectDesc + "\r\n\r\nThis library provides data structures and functoins for pretty printers." | _ -> projectDesc + "\r\n\r\nIt currently implements:\r\n\r\n" + "* Several standard monads: State, Reader, Writer, Either, Continuation, Distribution\r\n" + @@ -58,7 +56,7 @@ let rec getPackageDesc = function let gitHome = "https://github.com/fsprojects" // The name of the project on GitHub -let gitName = "fsharpx" +let gitName = "FSharpx.Extras" // The url for the raw files hosted let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" @@ -94,27 +92,10 @@ Target "AssemblyInfo" (fun _ -> CodeLanguage = FSharp AssemblyVersion = release.AssemblyVersion AssemblyTitle = projectName - AssemblyDescription = getPackageDesc "Core" + AssemblyDescription = getPackageDesc "Extras" Guid = "1e95a279-c2a9-498b-bc72-6e7a0d6854ce" - OutputFileName = "./src/FSharpx.Core/AssemblyInfo.fs" }) + OutputFileName = "./src/FSharpx.Extras/AssemblyInfo.fs" }) - AssemblyInfo (fun p -> - {p with - CodeLanguage = FSharp - AssemblyVersion = release.AssemblyVersion - AssemblyTitle = "FSharpx.Http" - AssemblyDescription = getPackageDesc "Http" - Guid = "60F3BB81-5449-45DD-A217-B6045327680C" - OutputFileName = "./src/FSharpx.Http/AssemblyInfo.fs" }) - - AssemblyInfo (fun p -> - {p with - CodeLanguage = FSharp - AssemblyVersion = release.AssemblyVersion - AssemblyTitle = "FSharpx.Observable" - AssemblyDescription = getPackageDesc "Observable" - Guid = "2E802F54-9CD0-4B0A-B834-5C5979403B50" - OutputFileName = "./src/FSharpx.Observable/AssemblyInfo.fs" }) AssemblyInfo (fun p -> {p with @@ -177,10 +158,10 @@ Target "NuGet" (fun _ -> Publish = hasBuildParam "nugetkey" ToolPath = nugetPath Dependencies = - if package = "Core" then p.Dependencies + if package = "Extras" then p.Dependencies else - [projectName + ".Core", RequireExactly (NormalizeVersion release.AssemblyVersion)] }) - "FSharpx.Core.nuspec") + ["FSharpx.Extras", RequireExactly (NormalizeVersion release.AssemblyVersion)] }) + "FSharpx.Extras.nuspec") diff --git a/docs/content/index.fsx b/docs/content/index.fsx index fd302cc9..4e6d9585 100644 --- a/docs/content/index.fsx +++ b/docs/content/index.fsx @@ -20,16 +20,16 @@ FSharpx.Core currently implements: * Functions to make C# - F# interop easier. -FSharpx.Core is a set of additions on top of FSharpx.Collections +* FSharpx.Http provides a few features for working with HTTP applications. + +FSharpx.Core is a set of additions on top of FSharpx.Collections and FSharpx.Async ## Extras These are some adhoc components which are now rarely used: -* FSharpx.Http provides a few features for working with HTTP applications. -* FSharpx.Observable implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford. -* FSharpx.Text.StructuredFormat provides data structures and functoins for pretty printers. +* FSharpx.Text.StructuredFormat provides data structures and functions for pretty printers. *) diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx index 0a6f9856..a476f21f 100644 --- a/docs/tools/generate.fsx +++ b/docs/tools/generate.fsx @@ -12,7 +12,7 @@ let githubLink = "https://github.com/fsprojects/fsharpx" // Specify more information about your project let info = - [ "project-name", "fsharpx" + [ "project-name", "FSharpx.Functional" "project-author", "Steffan Forkmann and others" "project-summary", "Extra components for FSharpx" "project-github", githubLink diff --git a/src/FSharpx.Core/AssemblyInfo.fs b/src/FSharpx.Core/AssemblyInfo.fs index 44e33b0d..70a82624 100644 --- a/src/FSharpx.Core/AssemblyInfo.fs +++ b/src/FSharpx.Core/AssemblyInfo.fs @@ -20,7 +20,7 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59 [] -[ + + + + ..\..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll + True + False @@ -95,6 +101,10 @@ FSharp.Core.dll $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + ..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll + True + ..\..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll True diff --git a/src/FSharpx.Core/Iteratee.fs b/src/FSharpx.Core/Iteratee.fs index ba4a0038..e3424c40 100644 --- a/src/FSharpx.Core/Iteratee.fs +++ b/src/FSharpx.Core/Iteratee.fs @@ -5,7 +5,7 @@ open System open System.Collections open System.Collections.Generic open FSharpx.Collections -open FSharpx.Control +open FSharp.Control (* # Iteratee @@ -700,18 +700,6 @@ module Iteratee = | Continue k -> let x, xs = ByteString.head str, ByteString.tail str in enumerate xs (k (Chunk (ByteString.singleton x))) | _ -> i - // TODO: Both source and sink should include a close function or IDisposable. - // NOTE: source and sink could implement IObservable and IObserver, respectively, though that could be misleading as they are intended to be used together. - let rec connect sink source = async { - match sink with - // Delay pulling from the source until we know that the sink needs data. - | Continue k -> - let! res = source - match res with - | AsyncSeqInner.Nil -> return run sink, AsyncSeq.empty - | Cons(s1, s2) -> return! connect (k (Chunk s1)) s2 - | _ -> return run sink, source - } // val repeat :: byte -> Enumerator let repeat a = checkContinue0 (fun loop k -> loop (k (Chunk (ByteString.singleton a)))) diff --git a/src/FSharpx.Core/Lens.fs b/src/FSharpx.Core/Lens.fs index a0d43ec5..3591be90 100644 --- a/src/FSharpx.Core/Lens.fs +++ b/src/FSharpx.Core/Lens.fs @@ -1,6 +1,8 @@ namespace FSharpx.Functional +open FSharpx open FSharpx.Collections +open FSharpx.Functional type Lens<'T,'U> = { Get: 'T -> 'U diff --git a/src/FSharpx.Http/Net.fs b/src/FSharpx.Core/Net.fs similarity index 98% rename from src/FSharpx.Http/Net.fs rename to src/FSharpx.Core/Net.fs index 374b3f2f..da5e03a8 100644 --- a/src/FSharpx.Http/Net.fs +++ b/src/FSharpx.Core/Net.fs @@ -11,7 +11,8 @@ open System.Text open System.Threading open FSharpx.IO -open FSharpx.Control +open FSharpx.Async +open FSharp.Control // ---------------------------------------------------------------------------- // Extensions that simplify working with HttpListener and related types diff --git a/src/FSharpx.Core/packages.config b/src/FSharpx.Core/packages.config index f89bbb97..20a24a6b 100644 --- a/src/FSharpx.Core/packages.config +++ b/src/FSharpx.Core/packages.config @@ -1,5 +1,7 @@  + + \ No newline at end of file diff --git a/src/FSharpx.Http/AssemblyInfo.fs b/src/FSharpx.Http/AssemblyInfo.fs deleted file mode 100644 index 73261020..00000000 --- a/src/FSharpx.Http/AssemblyInfo.fs +++ /dev/null @@ -1,35 +0,0 @@ -module FSharpx.Http.AssemblyInfo -#nowarn "49" // uppercase argument names -#nowarn "67" // this type test or downcast will always hold -#nowarn "66" // tis upast is unnecessary - the types are identical -#nowarn "58" // possible incorrect indentation.. -#nowarn "57" // do not use create_DelegateEvent -#nowarn "51" // address-of operator can occur in the code -open System -open System.Reflection -open System.Runtime.CompilerServices -open System.Runtime.InteropServices -exception ReturnException183c26a427ae489c8fd92ec21a0c9a59 of obj -exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59 - -[] - -[] - -[] - -[] - -[] - -[] - -[] - -[] - -[] - -() diff --git a/src/FSharpx.Http/FSharpx.Http.fsproj b/src/FSharpx.Http/FSharpx.Http.fsproj index cb7f4733..d771dfb2 100644 --- a/src/FSharpx.Http/FSharpx.Http.fsproj +++ b/src/FSharpx.Http/FSharpx.Http.fsproj @@ -45,12 +45,6 @@ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - - - - False diff --git a/src/FSharpx.Http/app.config b/src/FSharpx.Http/app.config deleted file mode 100644 index ff585b76..00000000 --- a/src/FSharpx.Http/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/FSharpx.Observable/FSharpx.Observable.fsproj b/src/FSharpx.Observable/FSharpx.Observable.fsproj index c5c09ef1..04fbe033 100644 --- a/src/FSharpx.Observable/FSharpx.Observable.fsproj +++ b/src/FSharpx.Observable/FSharpx.Observable.fsproj @@ -45,11 +45,6 @@ $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - - - diff --git a/src/FSharpx.Observable/ObservableDispatcherExtensions.fs b/src/FSharpx.Observable/ObservableDispatcherExtensions.fs deleted file mode 100644 index 15c7ba6f..00000000 --- a/src/FSharpx.Observable/ObservableDispatcherExtensions.fs +++ /dev/null @@ -1,30 +0,0 @@ -namespace FSharpx.Control - -open System -open System.Collections.Generic -open FSharpx.Control - -// ---------------------------------------------------------------------------- - -open System.Runtime.CompilerServices - -[] -type ObservableDispatcherExtensions private () = - - /// Execute Observer function on Dispatcher thread - /// For WPF and Silverlight - static let onDispatcher (observable:IObservable<'a>) = - #if SILVERLIGHT - let dispatcher = System.Windows.Deployment.Current.Dispatcher - #else - let dispatcher = System.Windows.Threading.Dispatcher.CurrentDispatcher - #endif - let f g = - dispatcher.BeginInvoke(Action(fun _ -> g())) |> ignore - Observable.invoke f observable - - [] - static member - OnDispatcher<'TSource> - (source:IObservable<'TSource>) = - source |> onDispatcher diff --git a/src/FSharpx.Observable/app.config b/src/FSharpx.Observable/app.config deleted file mode 100644 index ff585b76..00000000 --- a/src/FSharpx.Observable/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs b/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs index 9cae8dd5..a91ffffb 100644 --- a/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs +++ b/src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs @@ -20,9 +20,9 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59 [] -[] +This library provides data structures and functoins for pretty printers.")>] [] diff --git a/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj b/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj index 34352aa2..ea6af9b1 100644 --- a/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj +++ b/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj @@ -52,9 +52,16 @@ NET40 + + False + ..\..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll + True + + ..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll + False ..\..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll diff --git a/tests/FSharpx.CSharpTests/app.config b/tests/FSharpx.CSharpTests/app.config index ff585b76..d95ace21 100644 --- a/tests/FSharpx.CSharpTests/app.config +++ b/tests/FSharpx.CSharpTests/app.config @@ -4,7 +4,7 @@ - + diff --git a/tests/FSharpx.CSharpTests/packages.config b/tests/FSharpx.CSharpTests/packages.config index 98072aa9..280379d7 100644 --- a/tests/FSharpx.CSharpTests/packages.config +++ b/tests/FSharpx.CSharpTests/packages.config @@ -1,5 +1,7 @@  + + \ No newline at end of file diff --git a/tests/FSharpx.Http.Tests/FSharpx.Http.Tests.fsproj b/tests/FSharpx.Http.Tests/FSharpx.Http.Tests.fsproj index 1be7f94b..55ac429e 100644 --- a/tests/FSharpx.Http.Tests/FSharpx.Http.Tests.fsproj +++ b/tests/FSharpx.Http.Tests/FSharpx.Http.Tests.fsproj @@ -46,16 +46,6 @@ - - - - - - - FSharpx.Http - {60f3bb81-5449-45dd-a217-b6045327680c} - False - FSharpx.Tests {26d9d3ee-e882-43e6-a79e-5d1d89e92c4f} @@ -80,4 +70,11 @@ + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/tests/FSharpx.Http.Tests/app.config b/tests/FSharpx.Http.Tests/app.config deleted file mode 100644 index ff585b76..00000000 --- a/tests/FSharpx.Http.Tests/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tests/FSharpx.Http.Tests/packages.config b/tests/FSharpx.Http.Tests/packages.config deleted file mode 100644 index 6f50ba2e..00000000 --- a/tests/FSharpx.Http.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj b/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj index e7fac51f..8f1aaf16 100644 --- a/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj +++ b/tests/FSharpx.Observable.Tests/FSharpx.Observable.Tests.csproj @@ -58,11 +58,6 @@ - - - - - True @@ -71,14 +66,9 @@ {1e95a279-c2a9-498b-bc72-6e7a0d6854ce} FSharpx.Core - - {2E802F54-9CD0-4B0A-B834-5C5979403B50} - FSharpx.Observable - - - + diff --git a/tests/FSharpx.Observable.Tests/FromEventTests.cs b/tests/FSharpx.Observable.Tests/FromEventTests.cs deleted file mode 100644 index 73fd170a..00000000 --- a/tests/FSharpx.Observable.Tests/FromEventTests.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using FSharpx.Control; -using NUnit.Framework; - -[TestFixture] -public class FromEventTests -{ - public delegate void TestEventHandler(object sender, EventArgs e); - - event TestEventHandler TestEvent; - - [Test] - public void observable_generated_from_event_should_add_handler_on_subscribe() - { - bool added = false; - var observable = - Observable.FromEvent( - f => new TestEventHandler((sender, args) => f(args)), - handler => { added = true; TestEvent += handler; }, - handler => TestEvent -= handler); - var disposable = observable.Subscribe(_ => { }); - disposable.Dispose(); - Assert.True(added); - } - - [Test] - public void observable_generated_from_event_should_remove_handler_on_dispose() - { - bool removed = false; - var observable = - Observable.FromEvent( - f => new TestEventHandler((sender, args) => f(args)), - handler => TestEvent += handler, - handler => { removed = true; TestEvent -= handler; }); - var disposable = observable.Subscribe(_ => { }); - disposable.Dispose(); - Assert.True(removed); - } - - [Test] - public void subscription_to_observable_generated_from_event_should_receive_events() - { - var observable = - Observable.FromEvent( - f => new TestEventHandler((sender, args) => f(args)), - handler => TestEvent += handler, - handler => TestEvent -= handler); - int count = 0; - var disposable = observable.Subscribe(_ => ++count); - var e = TestEvent; - if (e != null) e(this, new EventArgs()); - disposable.Dispose(); - Assert.AreEqual(count,1); - } -} diff --git a/tests/FSharpx.Observable.Tests/Properties/AssemblyInfo.cs b/tests/FSharpx.Observable.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 212c0586..00000000 --- a/tests/FSharpx.Observable.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CSharp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSharp")] -[assembly: AssemblyCopyright("Copyright © 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b21472b9-c01b-4292-b83d-47758bb03899")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tests/FSharpx.Observable.Tests/ToObservableTests.cs b/tests/FSharpx.Observable.Tests/ToObservableTests.cs deleted file mode 100644 index 89319e59..00000000 --- a/tests/FSharpx.Observable.Tests/ToObservableTests.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections.Generic; -using FSharpx.Control; -using NUnit.Framework; - -[TestFixture] -public class ToObservableTests -{ - [Test] - public void and_empty_sequence_converted_to_obserables_should_yield_no_values() - { - var items = new int[] {}; - var observable = items.ToObservable(); - var observed = new List(); - var subscription = observable.Subscribe(observed.Add); - subscription.Dispose(); - Assert.AreEqual(observed.Count,0); - } - - [Test] - public void a_sequence_of_items_converted_to_an_obserable_should_yield_the_same_values() - { - var items = new[] {1,2,3}; - var observable = items.ToObservable(); - var observed = new List(); - var subscription = observable.Subscribe(observed.Add); - subscription.Dispose(); - Assert.AreEqual(items.Length, observed.Count); - for (int i = 0; i < items.Length; i++) - Assert.AreEqual(items[i], observed[i]); - } -} - diff --git a/tests/FSharpx.Observable.Tests/app.config b/tests/FSharpx.Observable.Tests/app.config deleted file mode 100644 index ff585b76..00000000 --- a/tests/FSharpx.Observable.Tests/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tests/FSharpx.Observable.Tests/packages.config b/tests/FSharpx.Observable.Tests/packages.config deleted file mode 100644 index 6f50ba2e..00000000 --- a/tests/FSharpx.Observable.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tests/FSharpx.Tests/AsyncOperatorsTest.fs b/tests/FSharpx.Tests/AsyncOperatorsTest.fs index 5c2fcc1c..9375ba2f 100644 --- a/tests/FSharpx.Tests/AsyncOperatorsTest.fs +++ b/tests/FSharpx.Tests/AsyncOperatorsTest.fs @@ -5,7 +5,6 @@ module FSharpx.Tests.AsyncOperatorsTest open FSharpx open FSharpx.Async -open FSharpx.Control open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/ChoiceTests.fs b/tests/FSharpx.Tests/ChoiceTests.fs index 3c5cccec..cfa2106c 100644 --- a/tests/FSharpx.Tests/ChoiceTests.fs +++ b/tests/FSharpx.Tests/ChoiceTests.fs @@ -2,6 +2,7 @@ open System open NUnit.Framework +open FSharpx open FSharpx.Functional open FsUnit @@ -63,7 +64,7 @@ let ChoiceFolding() = printfn "error: %s" error Assert.Fail("should not have failed: {0}", error) -open FSharpx.Functional.Choice +open FSharpx.Choice [] let ``computations are aborted on the first Choice2Of2``() = diff --git a/tests/FSharpx.Http.Tests/ConnegTests.fs b/tests/FSharpx.Tests/ConnegTests.fs similarity index 100% rename from tests/FSharpx.Http.Tests/ConnegTests.fs rename to tests/FSharpx.Tests/ConnegTests.fs diff --git a/tests/FSharpx.Tests/ContinuationTest.fs b/tests/FSharpx.Tests/ContinuationTest.fs index 57b5cfa4..97966d68 100644 --- a/tests/FSharpx.Tests/ContinuationTest.fs +++ b/tests/FSharpx.Tests/ContinuationTest.fs @@ -1,8 +1,9 @@ module FSharpx.Tests.ContinuationTest open System +open FSharpx open FSharpx.Functional -open FSharpx.Functional.Continuation +open FSharpx.Continuation open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/ControlTests.fs b/tests/FSharpx.Tests/ControlTests.fs index 5f96cd7a..c604b666 100644 --- a/tests/FSharpx.Tests/ControlTests.fs +++ b/tests/FSharpx.Tests/ControlTests.fs @@ -4,7 +4,10 @@ namespace FSharpx.Tests open Microsoft.FSharp.Control +open FSharp.Control open FSharpx.Control +open FSharpx.Async +open FSharpx open NUnit.Framework open System open System.IO diff --git a/tests/FSharpx.Tests/FSharpx.Tests.fsproj b/tests/FSharpx.Tests/FSharpx.Tests.fsproj index e198f83d..cb882b4d 100644 --- a/tests/FSharpx.Tests/FSharpx.Tests.fsproj +++ b/tests/FSharpx.Tests/FSharpx.Tests.fsproj @@ -94,15 +94,24 @@ + ..\..\packages\FsCheck.0.9.1.0\lib\net40-Client\FsCheck.dll True + + ..\..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll + True + True + + ..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll + True + ..\..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll True diff --git a/tests/FSharpx.Tests/FsCheckProperties.fs b/tests/FSharpx.Tests/FsCheckProperties.fs index a8d23d38..c55b726e 100644 --- a/tests/FSharpx.Tests/FsCheckProperties.fs +++ b/tests/FSharpx.Tests/FsCheckProperties.fs @@ -17,7 +17,7 @@ let checkEquality<'a when 'a : equality> name = fun (x: 'a) (y: 'a) (z: 'a) -> if x = y && y = z then x = z else true -let checkMonoid name (monoid: _ FSharpx.Functional.Monoid) = +let checkMonoid name (monoid: _ FSharpx.Monoid) = let n = sprintf "%s : monoid %s" name let mappend = curry monoid.Combine let mempty = monoid.Zero() diff --git a/tests/FSharpx.Tests/LensTests.fs b/tests/FSharpx.Tests/LensTests.fs index 0db4a290..649b62ce 100644 --- a/tests/FSharpx.Tests/LensTests.fs +++ b/tests/FSharpx.Tests/LensTests.fs @@ -5,7 +5,8 @@ open NUnit.Framework open FsCheck open FsCheck.NUnit open FSharpx -open FSharpx.Lens.Operators +open FSharpx.Functional +open FSharpx.Functional.Lens.Operators open FSharpx.Text type Car = { @@ -102,7 +103,7 @@ let stateMonad() = Assert.AreEqual(tom.Salary, r) Assert.AreEqual(1100, tom1.Salary) -open FSharpx.Lens.StateOperators +open FSharpx.Functional.Lens.StateOperators [] let stateMonadOperators() = diff --git a/tests/FSharpx.Tests/MaybeTest.fs b/tests/FSharpx.Tests/MaybeTest.fs index a6241f3e..e1adefa6 100644 --- a/tests/FSharpx.Tests/MaybeTest.fs +++ b/tests/FSharpx.Tests/MaybeTest.fs @@ -1,7 +1,7 @@ module FSharpx.Tests.MaybeTest open FSharpx.Functional -open FSharpx.Functional.Option +open FSharpx.Option open NUnit.Framework open FsCheck open FsCheck.NUnit diff --git a/tests/FSharpx.Tests/MonoidTests.fs b/tests/FSharpx.Tests/MonoidTests.fs index 5be01fde..4c37ea84 100644 --- a/tests/FSharpx.Tests/MonoidTests.fs +++ b/tests/FSharpx.Tests/MonoidTests.fs @@ -3,10 +3,11 @@ open NUnit.Framework open FsCheck open FsCheck.NUnit +open FSharpx open FSharpx.Functional open FSharpx.Collections open FSharpx.Tests.Properties -open FSharpx.Functional.Monoid +open FSharpx.Monoid type ByteStringGen = static member ByteStringArb = diff --git a/tests/FSharpx.Tests/OperatorsTest.fs b/tests/FSharpx.Tests/OperatorsTest.fs index fad7abaf..5f3a5f0a 100644 --- a/tests/FSharpx.Tests/OperatorsTest.fs +++ b/tests/FSharpx.Tests/OperatorsTest.fs @@ -1,6 +1,7 @@ module FSharp.Monad.Operators.Tests.OperatorsTest -open FSharpx.Functional.Operators +open FSharpx.Operators +open FSharpx.Functional open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/OptionTests.fs b/tests/FSharpx.Tests/OptionTests.fs index 27b07fe5..9a095f4e 100644 --- a/tests/FSharpx.Tests/OptionTests.fs +++ b/tests/FSharpx.Tests/OptionTests.fs @@ -3,7 +3,8 @@ open System open NUnit.Framework open FSharpx.Functional -open FSharpx.Functional.Option +open FSharpx +open FSharpx.Option [] let ``kleisli composition``() = diff --git a/tests/FSharpx.Tests/ReaderTest.fs b/tests/FSharpx.Tests/ReaderTest.fs index 2c9529fc..6a1675f1 100644 --- a/tests/FSharpx.Tests/ReaderTest.fs +++ b/tests/FSharpx.Tests/ReaderTest.fs @@ -2,7 +2,9 @@ open System open System.Threading -open FSharpx.Functional.Reader +open FSharpx +open FSharpx.Functional +open FSharpx.Reader open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/StateTest.fs b/tests/FSharpx.Tests/StateTest.fs index 86b76726..3b938495 100644 --- a/tests/FSharpx.Tests/StateTest.fs +++ b/tests/FSharpx.Tests/StateTest.fs @@ -1,6 +1,7 @@ module FSharpx.Tests.StateTest -open FSharpx.Functional.State +open FSharpx +open FSharpx.State open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/TaskBuilderTests.fs b/tests/FSharpx.Tests/TaskBuilderTests.fs index 8a242e5f..2078d3de 100644 --- a/tests/FSharpx.Tests/TaskBuilderTests.fs +++ b/tests/FSharpx.Tests/TaskBuilderTests.fs @@ -4,10 +4,13 @@ open System open System.IO open System.Net open NUnit.Framework +open FSharpx +open FSharpx.Task +open FSharpx.Async +open FSharpx.Control open FSharpx.Functional open System.Threading -#if NET40 open System.Threading.Tasks open FSharpx.Control.FileExtensions open FSharpx.Control.StreamReaderExtensions @@ -252,6 +255,4 @@ let ``combine``() = checkSuccess "hello world" t Assert.AreEqual(true, !flag) -#endif - diff --git a/tests/FSharpx.Tests/TaskTests.fs b/tests/FSharpx.Tests/TaskTests.fs index 8908517e..8aac2626 100644 --- a/tests/FSharpx.Tests/TaskTests.fs +++ b/tests/FSharpx.Tests/TaskTests.fs @@ -8,7 +8,6 @@ open FSharpx open FSharpx.Functional open System.Threading -#if NET40 open System.Threading.Tasks open FSharpx.Control.FileExtensions open FSharpx.Control.StreamReaderExtensions @@ -150,4 +149,3 @@ let ``run delay law``() = let task = Task.TaskBuilder(continuationOptions = TaskContinuationOptions.ExecuteSynchronously) fsCheck "run delay law" (fun a -> (task.Run << task.Delay << konst) a = a) -#endif diff --git a/tests/FSharpx.Tests/UndoTest.fs b/tests/FSharpx.Tests/UndoTest.fs index 61b0aca3..06d6fe68 100644 --- a/tests/FSharpx.Tests/UndoTest.fs +++ b/tests/FSharpx.Tests/UndoTest.fs @@ -1,6 +1,6 @@ module FSharpx.Tests.UndoTest -open FSharpx.Functional.Undo +open FSharpx.Undo open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/ValidationExample.fs b/tests/FSharpx.Tests/ValidationExample.fs index d54157a9..86142f0d 100644 --- a/tests/FSharpx.Tests/ValidationExample.fs +++ b/tests/FSharpx.Tests/ValidationExample.fs @@ -5,10 +5,11 @@ open NUnit.Framework open FsUnit +open FSharpx open FSharpx.Functional open FSharpx.Collections -open FSharpx.Functional.Choice -open FSharpx.Functional.Validation +open FSharpx.Choice +open FSharpx.Validation // First let's define a domain. diff --git a/tests/FSharpx.Tests/ValidationTests.fs b/tests/FSharpx.Tests/ValidationTests.fs index ebcc0f26..fa0b56c7 100644 --- a/tests/FSharpx.Tests/ValidationTests.fs +++ b/tests/FSharpx.Tests/ValidationTests.fs @@ -6,6 +6,7 @@ open Microsoft.FSharp.Core open FSharpx.Collections open FSharpx.CSharpTests open FSharpx +open FSharpx.Functional open FSharpx.Choice open FSharpx.Validation open FSharpx.Nullable diff --git a/tests/FSharpx.Tests/WriterTest.fs b/tests/FSharpx.Tests/WriterTest.fs index 45f0ad5b..0eb48aa5 100644 --- a/tests/FSharpx.Tests/WriterTest.fs +++ b/tests/FSharpx.Tests/WriterTest.fs @@ -1,7 +1,7 @@ module FSharpx.Tests.WriterTest open FSharpx -open FSharpx.Functional.Writer +open FSharpx.Writer open NUnit.Framework open FsUnit diff --git a/tests/FSharpx.Tests/app.config b/tests/FSharpx.Tests/app.config index ff585b76..d95ace21 100644 --- a/tests/FSharpx.Tests/app.config +++ b/tests/FSharpx.Tests/app.config @@ -4,7 +4,7 @@ - + diff --git a/tests/FSharpx.Tests/packages.config b/tests/FSharpx.Tests/packages.config index eb3889ed..a95879bd 100644 --- a/tests/FSharpx.Tests/packages.config +++ b/tests/FSharpx.Tests/packages.config @@ -1,6 +1,8 @@  + +