Skip to content

Commit 210d4fe

Browse files
committed
Use paket for push and pack
1 parent 400bde6 commit 210d4fe

7 files changed

Lines changed: 32 additions & 40 deletions

File tree

FSharpx.Async.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ EndProject
1515
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
1616
ProjectSection(SolutionItems) = preProject
1717
build.fsx = build.fsx
18-
nuget\FSharpx.Async.nuspec = nuget\FSharpx.Async.nuspec
1918
LICENSE.txt = LICENSE.txt
2019
README.md = README.md
2120
RELEASE_NOTES.md = RELEASE_NOTES.md

build.fsx

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,21 +158,16 @@ Target "SourceLink" (fun _ ->
158158
// Build a NuGet package
159159

160160
Target "NuGet" (fun _ ->
161-
NuGet (fun p ->
162-
{ p with
163-
Authors = authors
164-
Project = project
165-
Summary = summary
166-
Description = description
161+
Paket.Pack(fun p ->
162+
{ p with
167163
Version = release.NugetVersion
168-
ReleaseNotes = String.Join(Environment.NewLine, release.Notes)
169-
WorkingDir = "."
170-
Tags = tags
171-
OutputPath = "bin"
172-
AccessKey = getBuildParamOrDefault "nugetkey" ""
173-
Publish = hasBuildParam "nugetkey"
174-
Dependencies = [] })
175-
("nuget/" + project + ".nuspec")
164+
ReleaseNotes = toLines release.Notes})
165+
)
166+
167+
Target "PublishNuget" (fun _ ->
168+
Paket.Push(fun p ->
169+
{ p with
170+
WorkingDir = "bin"})
176171
)
177172

178173
// --------------------------------------------------------------------------------------
@@ -352,6 +347,7 @@ Target "All" DoNothing
352347
==> "Release"
353348

354349
"BuildPackage"
350+
==> "PublishNuget"
355351
==> "Release"
356352

357353
RunTargetOrDefault "All"

nuget/FSharpx.Async.nuspec

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

paket.dependencies

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ source https://nuget.org/api/v2
33
nuget FSharp.Formatting
44
nuget NUnit
55
nuget NUnit.Runners
6-
nuget Nuget.CommandLine
76
nuget FAKE
87
nuget SourceLink.Fake
98

paket.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ NUGET
1414
Microsoft.Net.Http (2.2.29)
1515
Microsoft.Bcl (>= 1.1.10)
1616
Microsoft.Bcl.Build (>= 1.0.14)
17-
NuGet.CommandLine (2.8.3)
1817
NUnit (2.6.4)
1918
NUnit.Runners (2.6.4)
2019
Octokit (0.7.1)

src/FSharpx.Async/FSharpx.Async.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<Compile Include="AsyncSeq.fs" />
8282
<Compile Include="Async.IO.fs" />
8383
<None Include="paket.references" />
84+
<None Include="paket.template" />
8485
</ItemGroup>
8586
<ItemGroup>
8687
<Reference Include="mscorlib" />

src/FSharpx.Async/paket.template

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
type project
2+
owners
3+
Thomas Petricek, David Thomas, Ryan Riley, Steffen Forkmann
4+
authors
5+
Thomas Petricek, David Thomas, Ryan Riley, Steffen Forkmann
6+
projectUrl
7+
http://fsprojects.github.io/FSharpx.Async/
8+
iconUrl
9+
http://fsprojects.github.io/FSharpx.Async/img/logo.png
10+
licenseUrl
11+
http://fsprojects.github.io/FSharpx.Async/license.html
12+
requireLicenseAcceptance
13+
false
14+
copyright
15+
Copyright 2015
16+
tags
17+
F#, async, fsharpx
18+
summary
19+
Async extensions for F#
20+
description
21+
Async extensions for F#

0 commit comments

Comments
 (0)