diff --git a/build.cmd b/build.cmd index 8c266b88..31dced18 100644 --- a/build.cmd +++ b/build.cmd @@ -1,6 +1,7 @@ @echo off cls -if not exist packages\FAKE\tools\FAKE.exe ( - tools\NuGet\NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion +if not exist tools\paket\paket.exe ( + tools\paket\paket.bootstrapper.exe ) +tools\paket\paket.exe install packages\FAKE\tools\FAKE.exe build.fsx %* diff --git a/build.sh b/build.sh index d0168af9..8357a0ef 100755 --- a/build.sh +++ b/build.sh @@ -2,10 +2,12 @@ if test "$OS" = "Windows_NT" then # use .Net - [ ! -f packages/FAKE/tools/FAKE.exe ] && tools/NuGet/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion + [ ! -f tools/paket/paket.exe ] && tools/paket/paket.bootstrapper.exe + tools/paket/paket.exe install packages/FAKE/tools/FAKE.exe build.fsx $@ else # use mono - [ ! -f packages/FAKE/tools/FAKE.exe ] && mono --runtime=v4.0 tools/NuGet/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion + [ ! -f tools/paket/paket.exe ] && mono --runtime=v4.0 tools/paket/paket.bootstrapper.exe + mono --runtime=v4.0 tools/paket/paket.exe install mono --runtime=v4.0 packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx fi diff --git a/docs/tools/build-docs.fsx b/docs/tools/build-docs.fsx index 893c77db..ddfa1689 100644 --- a/docs/tools/build-docs.fsx +++ b/docs/tools/build-docs.fsx @@ -20,10 +20,10 @@ let info = // For typical project, no changes are needed below // -------------------------------------------------------------------------------------- -#I "../../packages/FSharp.Compiler.Service.0.0.44/lib/net40" -#I "../../packages/RazorEngine.3.3.0/lib/net40/" -#r "../../packages/Microsoft.AspNet.Razor.2.0.30506.0/lib/net40/System.Web.Razor.dll" -#I "../../packages/FSharp.Formatting.2.4.4/lib/net40" +#I "../../packages/FSharp.Compiler.Service/lib/net40" +#I "../../packages/RazorEngine/lib/net40/" +#r "../../packages/Microsoft.AspNet.Razor/lib/net40/System.Web.Razor.dll" +#I "../../packages/FSharp.Formatting/lib/net40" #r "../../packages/FAKE/tools/FakeLib.dll" #r "FSharp.Compiler.Service.dll" #r "RazorEngine.dll" @@ -53,7 +53,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content" let output = __SOURCE_DIRECTORY__ @@ "../../out/docs" let files = __SOURCE_DIRECTORY__ @@ "../files" let templates = __SOURCE_DIRECTORY__ @@ "templates" -let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting.2.4.4/" +let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/" let docTemplate = formatting @@ "templates/docpage.cshtml" // Where to look for *.csproj templates (in this order) @@ -106,7 +106,7 @@ let buildDocumentation() = let sub = if dir.Length > content.Length then dir.Substring(content.Length + 1) else "." Literate.ProcessDirectory (dir, docTemplate, output @@ sub, replacements = ("root", root) :: info, layoutRoots = layoutRoots, - references = false, lineNumbers = true) + references = false, lineNumbers = true, generateAnchors = true) let cleanup() = for (_, docName) in extraDocs do DeleteFile (content @@ docName) diff --git a/paket.dependencies b/paket.dependencies index 684038b6..34f0530e 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -4,7 +4,7 @@ nuget TaskParallelLibrary 1.0.2856.0 nuget FAKE ~> 3.5 nuget NUnit.Runners ~> 2.6 -nuget FSharp.Formatting != 2.4.4 +nuget FSharp.Formatting !~> 2.4 nuget NUnit ~> 2.6 nuget FsUnit ~> 1.3 diff --git a/paket.lock b/paket.lock index 7dac4fef..c0cd52e4 100644 --- a/paket.lock +++ b/paket.lock @@ -4,11 +4,11 @@ NUGET BenchShark (1.0.0) ConsoleDump (0.6.0.1) FAKE (3.5.2) - FSharp.Compiler.Service (0.0.44) - FSharp.Formatting (2.4.4) - Microsoft.AspNet.Razor (>= 2.0.30506.0) - RazorEngine (>= 3.3.0) - FSharp.Compiler.Service (>= 0.0.44) + FSharp.Compiler.Service (0.0.59) + FSharp.Formatting (2.4.24) + Microsoft.AspNet.Razor (2.0.30506.0) + RazorEngine (3.3.0) + FSharp.Compiler.Service (0.0.59) FsUnit (1.3.0.1) NUnit (>= 2.6.3) MathNet.Numerics (3.0.0)