Merge pull request #462 from forki/paketpack

Use Paket to create Nuget packages
fsharp · Nov 11, 2015 · 839bab6 · 839bab6
2 parents 3291102 + fdea4e1
commit 839bab6
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,4 @@ sudo: false
 install:
 
 script: 
-  - ./build.sh
+  - ./build.sh NuGet
diff --git a/FSharp.Compiler.Service.sln b/FSharp.Compiler.Service.sln
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{B6B6
 		build.fsx = build.fsx
 		nuget\FSharp.Compiler.Service.nuspec = nuget\FSharp.Compiler.Service.nuspec
 		paket.dependencies = paket.dependencies
+		nuget\paket.template = nuget\paket.template
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection

diff --git a/build.fsx b/build.fsx
@@ -20,13 +20,6 @@ open SourceLink
 
 let project = "FSharp.Compiler.Service"
 let authors = ["Microsoft Corporation, Dave Thomas, Anh-Dung Phan, Tomas Petricek"]
-let summary = "F# compiler services for creating IDE tools, language extensions and for F# embedding"
-let description = """
-  The F# compiler services package contains a custom build of the F# compiler that
-  exposes additional functionality for implementing F# language bindings, additional
-  tools based on the compiler or refactoring tools. The package also includes F# 
-  interactive service that can be used for embedding F# scripting into your applications."""
-let tags = "F# fsharp interactive compiler editor"
 
 let gitOwner = "fsharp"
 let gitHome = "https://github.com/" + gitOwner
@@ -142,19 +135,19 @@ Target "RunTests" (fun _ ->
 // Build a NuGet package
 
 Target "NuGet" (fun _ ->
-    NuGet (fun p -> 
+    Paket.Pack (fun p -> 
         { p with 
-            Authors = authors
-            Project = project
-            Summary = summary
-            Description = description
-            Version = buildVersion
-            ReleaseNotes = release.Notes |> toLines
-            Tags = tags
+            TemplateFile = "nuget/paket.template"
+            Version = release.NugetVersion
             OutputPath = buildDir
-            AccessKey = getBuildParamOrDefault "nugetkey" ""
-            Publish = hasBuildParam "nugetkey" })
-        ("nuget/" + project + ".nuspec")
+            ReleaseNotes = toLines release.Notes })
+)
+
+
+Target "PublishNuGet" (fun _ ->
+    Paket.Push (fun p -> 
+        { p with
+            WorkingDir = buildDir }) 
 )
 
 // --------------------------------------------------------------------------------------
@@ -241,6 +234,7 @@ Target "All" DoNothing
   ==> "GenerateDocsJa"
   ==> "GenerateDocs"
   ==> "ReleaseDocs"
+  ==> "PublishNuGet"
   ==> "Release"
 
 RunTargetOrDefault "All"
diff --git a/nuget/FSharp.Compiler.Service.nuspec b/nuget/FSharp.Compiler.Service.nuspec
diff --git a/nuget/paket.template b/nuget/paket.template
@@ -0,0 +1,25 @@
+type file
+id FSharp.Compiler.Service
+description
+    The F# compiler services package contains a custom build of the F# compiler that
+	exposes additional functionality for implementing F# language bindings, additional
+	tools based on the compiler or refactoring tools. The package also includes F# 
+	interactive service that can be used for embedding F# scripting into your applications.
+authors
+    Microsoft Corporation, Dave Thomas, Anh-Dung Phan, Tomas Petricek
+summary
+    F# compiler services for creating IDE tools, language extensions and for F# embedding.
+licenseurl https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE
+projecturl https://github.com/fsharp/FSharp.Compiler.Service
+iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png
+tags
+    F#, fsharp, interactive, compiler, editor
+files
+    ../bin/v4.0/FSharp.Compiler.Service.dll ==> lib/net40
+    ../bin/v4.0/FSharp.Compiler.Service.XML ==> lib/net40
+    ../bin/v4.0/FSharp.Compiler.Service.?db ==> lib/net40
+    ../bin/v4.0/FSharp.Compiler.Service.dll.?db ==> lib/net40
+    ../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
+    ../bin/v4.5/FSharp.Compiler.Service.XML ==> lib/net45
+    ../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
+    ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
diff --git a/nuget/publish.cmd b/nuget/publish.cmd
diff --git a/paket.dependencies b/paket.dependencies
@@ -6,7 +6,6 @@ nuget SQLite.Net-PCL 3.0.5
 nuget SQLite.Net.Platform.Generic 2.4.1
 
 # build dependencies
-nuget NuGet.CommandLine
 nuget FAKE
 nuget FSharp.Formatting
 nuget SourceLink.Fake

diff --git a/paket.lock b/paket.lock
@@ -14,7 +14,6 @@ NUGET
     Microsoft.Net.Http (2.2.29)
       Microsoft.Bcl (>= 1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
-    NuGet.CommandLine (2.8.6)
     NUnit (2.6.3)
     NUnit.Runners (2.6.3)
     Octokit (0.14.0) - framework: wpv8.0