Merge remote-tracking branch 'upstream/master'

Author: eulerfx

FSharpx.Async.sln

@@ -15,7 +15,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
 	ProjectSection(SolutionItems) = preProject
 		build.fsx = build.fsx
-		nuget\FSharpx.Async.nuspec = nuget\FSharpx.Async.nuspec
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md

RELEASE_NOTES.md

@@ -1,9 +1,13 @@
-### 1.9.9 - 23.02.2015
+### 1.11.0 - 27.02.2015
 * Added Async.map, Async.bind, Async.unit
 * Added AsyncSeq.toList, AsyncSeq.toArray, AsyncSeq.bufferByCount, AsyncSeq.unfoldAsync, AsyncSeq.concatSeq, AsyncSeq.interleave
 
+### 1.10.0 - 25.02.2015
+* Use Paket instead of NuGet
+
 ### 1.9.9 - 23.02.2015
 * BUGFIX: AsyncSeq.skipWhile skips an extra item - https://github.com/fsprojects/FSharpx.Async/pull/2
 
 ### 1.9.9 - 23.02.2015
-* Copied the async helpers from FSharpx
+* Copied the async helpers from FSharpx
+* BUGFIX: AsyncSeq.skipWhile skips an extra item - https://github.com/fsprojects/FSharpx.Async/pull/2

build.fsx

@@ -42,7 +42,7 @@ let description = "Async extensions for F#"
 let authors = [ "Thomas Petricek"; "David Thomas"; "Ryan Riley"; "Steffen Forkmann" ]
 
 // Tags for your project (for NuGet package)
-let tags = "F#, async, fsharp"
+let tags = "F#, async, fsharpx"
 
 // File system information 
 let solutionFile  = "FSharpx.Async.sln"
@@ -158,21 +158,16 @@ Target "SourceLink" (fun _ ->
 // Build a NuGet package
 
 Target "NuGet" (fun _ ->
-    NuGet (fun p ->
-        { p with
-            Authors = authors
-            Project = project
-            Summary = summary
-            Description = description
+    Paket.Pack(fun p -> 
+         { p with
             Version = release.NugetVersion
-            ReleaseNotes = String.Join(Environment.NewLine, release.Notes)
-            WorkingDir = "."
-            Tags = tags
-            OutputPath = "bin"
-            AccessKey = getBuildParamOrDefault "nugetkey" ""
-            Publish = hasBuildParam "nugetkey"
-            Dependencies = [] })
-        ("nuget/" + project + ".nuspec")
+            ReleaseNotes = toLines release.Notes})
+)
+
+Target "PublishNuget" (fun _ ->
+    Paket.Push(fun p -> 
+        { p with
+            WorkingDir = "./temp"  })
 )
 
 // --------------------------------------------------------------------------------------
@@ -352,6 +347,7 @@ Target "All" DoNothing
   ==> "Release"
 
 "BuildPackage"
+  ==> "PublishNuget"
   ==> "Release"
 
 RunTargetOrDefault "All"

nuget/FSharpx.Async.nuspec

@@ -3,7 +3,6 @@ source https://nuget.org/api/v2
 nuget FSharp.Formatting
 nuget NUnit 
 nuget NUnit.Runners
-nuget Nuget.CommandLine
 nuget FAKE
 nuget SourceLink.Fake
 

paket.dependencies

@@ -1,30 +1,29 @@
 NUGET
   remote: https://nuget.org/api/v2
   specs:
-    FAKE (3.17.5)
-    FSharp.Compiler.Service (0.0.82)
+    FAKE (3.17.13)
+    FSharp.Compiler.Service (0.0.84)
     FSharp.Formatting (2.7.4)
       FSharp.Compiler.Service (>= 0.0.82)
       FSharpVSPowerTools.Core (>= 1.7.0)
     FSharpVSPowerTools.Core (1.7.0)
       FSharp.Compiler.Service (>= 0.0.81)
-    Microsoft.Bcl (1.1.9)
+    Microsoft.Bcl (1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
     Microsoft.Bcl.Build (1.0.21)
-    Microsoft.Net.Http (2.2.28)
-      Microsoft.Bcl (>= 1.1.9)
+    Microsoft.Net.Http (2.2.29)
+      Microsoft.Bcl (>= 1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
-    NuGet.CommandLine (2.8.3)
     NUnit (2.6.4)
     NUnit.Runners (2.6.4)
-    Octokit (0.6.2)
+    Octokit (0.7.1)
       Microsoft.Net.Http
     SourceLink.Fake (0.4.2)
 GITHUB
   remote: fsharp/FAKE
   specs:
-    modules/Octokit/Octokit.fsx (575e7ab5050d2ddec80ba8d3a98cfb10ba327965)
+    modules/Octokit/Octokit.fsx (99bf805630805455031684c9369b1872d14a4fdd)
       Octokit
   remote: fsprojects/FSharpx.Collections
   specs:
-    src/FSharpx.Collections/CircularBuffer.fs (e8fdc9c6d61618bdcc5c4f143ecbbfbe785b8ec4)
+    src/FSharpx.Collections/CircularBuffer.fs (259ad697b43d12a2bdc3aedb3f7ea3d0e46157f7)

paket.lock

@@ -4,9 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharpx.Async")>]
 [<assembly: AssemblyProductAttribute("FSharpx.Async")>]
 [<assembly: AssemblyDescriptionAttribute("Async extensions for F#")>]
-[<assembly: AssemblyVersionAttribute("1.9.9")>]
-[<assembly: AssemblyFileVersionAttribute("1.9.9")>]
+[<assembly: AssemblyVersionAttribute("1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "1.9.9"
+    let [<Literal>] Version = "1.11.0"

src/FSharpx.Async/AssemblyInfo.fs

@@ -82,6 +82,7 @@
     <Compile Include="AsyncStream.fs" />
     <Compile Include="Async.IO.fs" />
     <None Include="paket.references" />
+    <None Include="paket.template" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />

src/FSharpx.Async/FSharpx.Async.fsproj

@@ -0,0 +1,21 @@
+type project
+owners
+    Thomas Petricek, David Thomas, Ryan Riley, Steffen Forkmann
+authors
+    Thomas Petricek, David Thomas, Ryan Riley, Steffen Forkmann
+projectUrl
+    http://fsprojects.github.io/FSharpx.Async/
+iconUrl
+    http://fsprojects.github.io/FSharpx.Async/img/logo.png
+licenseUrl
+    http://fsprojects.github.io/FSharpx.Async/license.html
+requireLicenseAcceptance
+    false
+copyright
+    Copyright 2015
+tags
+    F#, async, fsharpx
+summary
+    Async extensions for F#
+description
+    Async extensions for F#