Merge remote-tracking branch 'upstream/master'

Author: alfonsogarciacaro

README.md

@@ -3,7 +3,7 @@ F# Compiler Service
 
 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# 
+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.
 
 Documentation
@@ -12,7 +12,6 @@ Documentation
 For more information about the project, see:
 
  * [F# Compiler Service documentation](http://fsharp.github.io/FSharp.Compiler.Service/)
- * [FSharp.Compiler.Service package on NuGet](https://www.nuget.org/packages/FSharp.Compiler.Service)
  * [Developer notes explain the project structure](http://fsharp.github.io/FSharp.Compiler.Service/devnotes.html)
 
 Build Status
@@ -22,6 +21,32 @@ Head (branch ``master``), Mono 3.x, OSX + unit tests (Travis) [![Build Status](h
 
 Head (branch ``master``), Windows Server 2012 R2 + unit tests (AppVeyor)  [![Build status](https://ci.appveyor.com/api/projects/status/3yllu2qh19brk61d)](https://ci.appveyor.com/project/fsgit/fsharp-compiler-service)
 
+NuGet Feed
+------------
+
+Stable builds are available in the NuGet Gallery:
+[https://www.nuget.org/packages/FSharp.Compiler.Service](https://www.nuget.org/packages/FSharp.Compiler.Service)
+
+All AppVeyor builds are available using the NuGet feed: https://ci.appveyor.com/nuget/fsgit-fsharp-compiler-service
+
+If using Paket, add the source at the top of `paket.dependencies`.
+
+```
+source https://www.nuget.org/api/v2
+source https://ci.appveyor.com/nuget/fsgit-fsharp-compiler-service
+```
+
+See the build history for a list of available versions: https://ci.appveyor.com/project/fsgit/fsharp-compiler-service/history
+
+Here are some options for specifying the dependency:
+
+```
+nuget FSharp.Compiler.Service
+nuget FSharp.Compiler.Service prerelease
+nuget FSharp.Compiler.Service 1.3.1.0
+nuget FSharp.Compiler.Service 1.3.1.1-b402
+```
+
 Dev Guide
 ----------
 

RELEASE_NOTES.md

@@ -1,3 +1,5 @@
+#### 1.3.1.1 -
+
 #### 1.3.1.0 -
 * simplified source indexing with new SourceLink
 * Add noframework option in AST compiler methods

appveyor.yml

@@ -3,6 +3,6 @@ init:
 build_script:
   - cmd: build.cmd Release
 test: off
-version: 0.0.49.{build}
+version: '{build}'
 artifacts:
   - path: bin\*.nupkg

build.fsx

@@ -6,7 +6,8 @@
 #r "packages/FAKE/tools/FakeLib.dll"
 #load "packages/SourceLink.Fake/tools/SourceLink.fsx"
 open System
-open Fake 
+open Fake.AppVeyor
+open Fake
 open Fake.Git
 open Fake.ReleaseNotesHelper
 open Fake.AssemblyInfoFile
@@ -38,21 +39,35 @@ let netFrameworks = ["v4.0"; "v4.5"]
 
 // Read release notes & version info from RELEASE_NOTES.md
 let release = LoadReleaseNotes "RELEASE_NOTES.md"
-let isAppVeyorBuild = environVar "APPVEYOR" <> null
-let nugetVersion = 
-    if isAppVeyorBuild then sprintf "%s-a%s" release.NugetVersion (DateTime.UtcNow.ToString "yyMMddHHmm")
-    else release.NugetVersion
+let isAppVeyorBuild = buildServer = BuildServer.AppVeyor
+let isVersionTag tag = Version.TryParse tag |> fst
+let hasRepoVersionTag = isAppVeyorBuild && AppVeyorEnvironment.RepoTag && isVersionTag AppVeyorEnvironment.RepoTagName
+let assemblyVersion = if hasRepoVersionTag then AppVeyorEnvironment.RepoTagName else release.NugetVersion
+let buildDate = DateTime.UtcNow
+let buildVersion = 
+    if hasRepoVersionTag then assemblyVersion
+    else if isAppVeyorBuild then sprintf "%s-b%s" assemblyVersion AppVeyorEnvironment.BuildNumber
+    else sprintf "%s-a%s" assemblyVersion (buildDate.ToString "yyMMddHHmm")
 
 Target "BuildVersion" (fun _ ->
-    Shell.Exec("appveyor", sprintf "UpdateBuild -Version \"%s\"" nugetVersion) |> ignore
+    Shell.Exec("appveyor", sprintf "UpdateBuild -Version \"%s\"" buildVersion) |> ignore
 )
 
 // Generate assembly info files with the right version & up-to-date information
 Target "AssemblyInfo" (fun _ ->
-  let fileName = "src/assemblyinfo/assemblyinfo.shared.fs"
-  CreateFSharpAssemblyInfo fileName
-      [ Attribute.Version release.AssemblyVersion
-        Attribute.FileVersion release.AssemblyVersion] 
+    let fileName = "src/assemblyinfo/assemblyinfo.shared.fs"
+    // add json info to the informational version
+    let iv = Text.StringBuilder() // json
+    iv.Appendf "{\\\"buildVersion\\\":\\\"%s\\\"" buildVersion
+    iv.Appendf ",\\\"buildDate\\\":\\\"%s\\\"" (buildDate.ToString "yyyy'-'MM'-'dd'T'HH':'mm':'sszzz")
+    if isAppVeyorBuild then
+        iv.Appendf ",\\\"gitCommit\\\":\\\"%s\\\"" AppVeyor.AppVeyorEnvironment.RepoCommit
+        iv.Appendf ",\\\"gitBranch\\\":\\\"%s\\\"" AppVeyor.AppVeyorEnvironment.RepoBranch
+    iv.Appendf "}"
+    CreateFSharpAssemblyInfo fileName
+          [ Attribute.Version assemblyVersion
+            Attribute.FileVersion assemblyVersion
+            Attribute.InformationalVersion iv.String ]
 )
 
 // --------------------------------------------------------------------------------------
@@ -136,7 +151,7 @@ Target "NuGet" (fun _ ->
             Project = project
             Summary = summary
             Description = description
-            Version = nugetVersion
+            Version = buildVersion
             ReleaseNotes = release.Notes |> toLines
             Tags = tags
             OutputPath = "bin"
@@ -167,7 +182,7 @@ Target "ReleaseDocs" (fun _ ->
     fullclean tempDocsDir
     CopyRecursive "docs/output" "temp/gh-pages" true |> printfn "%A"
     StageAll tempDocsDir
-    Commit tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion)
+    Commit tempDocsDir (sprintf "Update generated documentation for version %s" buildVersion)
     Branches.push "temp/gh-pages"
 )
 

docs/tools/generate.fsx

@@ -20,18 +20,9 @@ let info =
 // For typical project, no changes are needed below
 // --------------------------------------------------------------------------------------
 
-#I "../../packages/FSharpVSPowerTools.Core/lib/net45"
-#I "../../packages/FSharp.Formatting/lib/net40"
-#I "../../packages/FSharp.Compiler.Service/lib/net45"
+#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx"
 #I "../../packages/FAKE/tools"
-#r "FSharpVSPowerTools.Core.dll"
-#r "System.Web.Razor.dll"
-#r "FakeLib.dll"
-#r "FSharp.Compiler.Service.dll"
-#r "RazorEngine.dll"
-#r "FSharp.Literate.dll"
-#r "FSharp.CodeFormat.dll"
-#r "FSharp.MetadataFormat.dll"
+#r "../../packages/FAKE/tools/FakeLib.dll"
 open Fake
 open System.IO
 open Fake.FileHelper