rename to FSharpx.Extras and modernize

fsprojects · Mar 31, 2015 · ee6ba78 · ee6ba78
1 parent acd23f0
commit ee6ba78
Show file tree

Hide file tree

Showing 60 changed files with 121 additions and 427 deletions.
diff --git 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
 
 [<TestFixture>]
 type ``AwaitObservable Tests``() = 
@@ -26,7 +28,7 @@ type ``AwaitObservable Tests``() =
     [<Test; Ignore("Failing on appveyor ('A continuation provided by Async.FromContinuations was invoked multiple times')") >]
     member test.``AwaitObservable yields the first value from the sources Next``() =
         let source = new ObservableMock<string>()
-        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
@@ -49,6 +49,14 @@
   </PropertyGroup>
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <ItemGroup>
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharpx.Collections">
       <HintPath>..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
       <Private>True</Private>

diff --git a/FSharpx.Core.Tests/app.config b/FSharpx.Core.Tests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/FSharpx.Core.Tests/packages.config b/FSharpx.Core.Tests/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="FSharp.Control.AsyncSeq" version="1.15.0" targetFramework="net40" />
+  <package id="FSharpx.Async" version="1.12.0" targetFramework="net40" />
   <package id="FSharpx.Collections" version="1.9.4" targetFramework="net40" />
   <package id="FsUnit" version="1.2.1.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -20,7 +20,7 @@ exception ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59
 
 [<assembly: AssemblyTitle ("FSharpx")>]
 
-[<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.
+[<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.
 
 It currently implements:
 

diff --git a/src/FSharpx.Core/CSharpCompat.fs b/src/FSharpx.Core/CSharpCompat.fs
@@ -5,8 +5,9 @@ open System.IO
 open System.Net
 open System.Collections.Generic
 open System.Runtime.CompilerServices
-open FSharpx.Control.StreamReaderExtensions
 open FSharpx.Collections
+open FSharpx.Functional
+open FSharpx.Control
 open FSharpx
 
 

diff --git a/src/FSharpx.Core/ComputationExpressions/Continuation.fs b/src/FSharpx.Core/ComputationExpressions/Continuation.fs
@@ -3,6 +3,7 @@
 open System
 open System.Collections.Generic
 open FSharpx.Collections
+open FSharpx.Functional
 
 /// The continuation monad.
 /// The algorithm is from Wes Dyer http://blogs.msdn.com/b/wesdyer/archive/2008/01/11/the-marvels-of-monads.aspx.

diff --git a/src/FSharpx.Core/ComputationExpressions/Enumerator.fs b/src/FSharpx.Core/ComputationExpressions/Enumerator.fs
@@ -3,9 +3,7 @@ namespace FSharpx.Functional
 open System
 open System.Collections
 open System.Collections.Generic
-#if NET40
 open System.Diagnostics.Contracts
-#endif
 open System.Runtime.CompilerServices
 
 module Enumerator = 

diff --git a/src/FSharpx.Core/ComputationExpressions/Monad.fs b/src/FSharpx.Core/ComputationExpressions/Monad.fs
@@ -6,6 +6,7 @@ open System
 open System.Collections
 open System.Collections.Generic
 open FSharpx.Collections
+open FSharpx.Functional
 
 
 /// Generic monadic operators    
@@ -906,7 +907,6 @@ module Validation =
 
     let inline mapM f x = sequence (List.map f x)
 
-#if NET40
 
 module Task =
     open System.Threading
@@ -1074,4 +1074,3 @@ module Task =
 
         member this.Delay f = this.Bind(this.Return (), f)
 
-#endif
diff --git a/src/FSharpx.Http/Conneg.fs → src/FSharpx.Core/Conneg.fs b/src/FSharpx.Http/Conneg.fs → src/FSharpx.Core/Conneg.fs
diff --git a/src/FSharpx.Core/FSharpx.Core.fsproj b/src/FSharpx.Core/FSharpx.Core.fsproj
@@ -84,8 +84,14 @@
     <Compile Include="CSharpCompat.fs" />
     <Content Include="packages.config" />
     <Content Include="app.config" />
+    <Compile Include="Net.fs" />
+    <Compile Include="Conneg.fs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Control.AsyncSeq">
+      <HintPath>..\..\packages\FSharp.Control.AsyncSeq.1.15.0\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(TargetFrameworkProfile)' == ''">
       <Private>False</Private>
     </Reference>
@@ -95,6 +101,10 @@
       <AssemblyName>FSharp.Core.dll</AssemblyName>
       <HintPath>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
     </Reference>
+    <Reference Include="FSharpx.Async">
+      <HintPath>..\..\packages\FSharpx.Async.1.12.0\lib\net40\FSharpx.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharpx.Collections" Condition="'$(TargetFrameworkProfile)' == ''">
       <HintPath>..\..\packages\FSharpx.Collections.1.9.4\lib\net35\FSharpx.Collections.dll</HintPath>
       <Private>True</Private>

diff --git 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<ByteString, 'T>
         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
@@ -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 → src/FSharpx.Core/Net.fs b/src/FSharpx.Http/Net.fs → 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