Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Candidate 7 #1881

Merged
merged 10 commits into from
Apr 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions .fake/build.fsx/intellisense.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection.typeextensions\\4.4.0\\lib\\net461\\System.Reflection.TypeExtensions.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\lib\\net463\\System.Runtime.InteropServices.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime.serialization.formatters\\4.3.0\\lib\\net46\\System.Runtime.Serialization.Formatters.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.console\\4.3.0\\lib\\net46\\System.Console.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.console\\4.3.1\\lib\\net46\\System.Console.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.io.filesystem\\4.3.0\\lib\\net46\\System.IO.FileSystem.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.net.sockets\\4.3.0\\lib\\net46\\System.Net.Sockets.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection\\4.3.0\\lib\\net462\\System.Reflection.dll"
Expand All @@ -60,43 +60,43 @@
#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime\\4.3.0\\lib\\net462\\System.Runtime.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.security.principal.windows\\4.4.1\\lib\\net461\\System.Security.Principal.Windows.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.4.0\\lib\\net461\\System.Security.Cryptography.ProtectedData.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-rc005\\lib\\net46\\Fake.Core.Xml.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-rc005\\lib\\net46\\Fake.Core.SemVer.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\paket.core\\5.156.1\\lib\\net45\\Paket.Core.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-rc005\\lib\\net46\\Fake.Api.GitHub.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-rc005\\lib\\net46\\Fake.Core.Context.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-rc005\\lib\\net46\\Fake.Core.Environment.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-rc005\\lib\\net46\\Fake.Core.String.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-rc006\\lib\\net46\\Fake.Core.Xml.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-rc006\\lib\\net46\\Fake.Core.SemVer.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\paket.core\\5.156.5\\lib\\net45\\Paket.Core.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-rc006\\lib\\net46\\Fake.Api.GitHub.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-rc006\\lib\\net46\\Fake.Core.Context.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-rc006\\lib\\net46\\Fake.Core.Environment.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-rc006\\lib\\net46\\Fake.Core.String.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fparsec\\1.0.3\\lib\\net40-client\\FParsec.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection.metadata\\1.5.0\\lib\\netstandard2.0\\System.Reflection.Metadata.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Rocks.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Pdb.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Mdb.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-rc005\\lib\\net46\\Fake.Core.ReleaseNotes.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-rc005\\lib\\net46\\Fake.IO.FileSystem.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.commandlineparsing\\5.0.0-rc005\\lib\\net46\\Fake.Core.CommandLineParsing.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-rc005\\lib\\net46\\Fake.Core.Trace.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamfoundation\\5.0.0-rc005\\lib\\net46\\Fake.BuildServer.TeamFoundation.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.travis\\5.0.0-rc005\\lib\\net46\\Fake.BuildServer.Travis.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-rc005\\lib\\net46\\Fake.Core.Tasks.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-rc005\\lib\\net46\\Fake.Testing.Common.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-rc005\\lib\\net46\\Fake.Core.Process.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-rc005\\lib\\net46\\Fake.IO.Zip.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-rc005\\lib\\net46\\Fake.Core.Target.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.net.http\\5.0.0-rc005\\lib\\net46\\Fake.Net.Http.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.appveyor\\5.0.0-rc005\\lib\\net46\\Fake.BuildServer.AppVeyor.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamcity\\5.0.0-rc005\\lib\\net46\\Fake.BuildServer.TeamCity.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.NuGet.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.Cli.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.FSFormatting.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.MSBuild.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-rc005\\lib\\net46\\Fake.DotNet.Paket.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-rc005\\lib\\net46\\Fake.Tools.Git.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-rc005\\lib\\net46\\Fake.Windows.Chocolatey.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-rc006\\lib\\net46\\Fake.Core.ReleaseNotes.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-rc006\\lib\\net46\\Fake.IO.FileSystem.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.commandlineparsing\\5.0.0-rc006\\lib\\net46\\Fake.Core.CommandLineParsing.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-rc006\\lib\\net46\\Fake.Core.Trace.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamfoundation\\5.0.0-rc006\\lib\\net46\\Fake.BuildServer.TeamFoundation.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.travis\\5.0.0-rc006\\lib\\net46\\Fake.BuildServer.Travis.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-rc006\\lib\\net46\\Fake.Core.Tasks.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-rc006\\lib\\net46\\Fake.Testing.Common.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-rc006\\lib\\net46\\Fake.Core.Process.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-rc006\\lib\\net46\\Fake.IO.Zip.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-rc006\\lib\\net46\\Fake.Core.Target.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.net.http\\5.0.0-rc006\\lib\\net46\\Fake.Net.Http.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.appveyor\\5.0.0-rc006\\lib\\net46\\Fake.BuildServer.AppVeyor.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamcity\\5.0.0-rc006\\lib\\net46\\Fake.BuildServer.TeamCity.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.NuGet.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.Cli.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.FSFormatting.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.MSBuild.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-rc006\\lib\\net46\\Fake.DotNet.Paket.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-rc006\\lib\\net46\\Fake.Tools.Git.dll"
#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-rc006\\lib\\net46\\Fake.Windows.Chocolatey.dll"
#r "System"
#r "System.Core"
#r "System.Security"
Expand Down
13 changes: 7 additions & 6 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@

<!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
<PropertyGroup>
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
</PropertyGroup>

<!-- If shasum and awk exist get the hashes -->
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
</Exec>
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
</Exec>

<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
Expand Down Expand Up @@ -127,6 +127,7 @@
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
</PackageReference>
</ItemGroup>

Expand Down Expand Up @@ -183,8 +184,8 @@

<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
</ConvertToAbsolutePath>
</ConvertToAbsolutePath>


<!-- Call Pack -->
<PackTask Condition="$(UseNewPack)"
Expand Down
8 changes: 8 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Release Notes

## 5.0.0-rc007 - 2018-04-23

* DOCS: Update documentation issues - https://github.com/fsharp/FAKE/pull/1881
* BUGFIX: Improve error message when groups doesn't exist - https://github.com/fsharp/FAKE/issues/1874
* BUGFIX: Improve error message when file doesn't exist (`Process.start`) - https://github.com/fsharp/FAKE/issues/1875
* ENHANCEMENT: Make `Shell` module conform to API-guidelines. Mark existing functions as obsolete - https://github.com/fsharp/FAKE/pull/1882


## 5.0.0-rc006 - 2018-04-22

* FAKE5: New module `Fake.DotNet.Testing.Expecto` - https://github.com/fsharp/FAKE/pull/1871
Expand Down
74 changes: 74 additions & 0 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,17 @@ Target.create "WorkaroundPaketNuspecBug" (fun _ ->
Target.create "Clean" (fun _ ->
!! "src/*/*/bin"
//++ "src/*/*/obj"
#if BOOTSTRAP
|> Shell.cleanDirs
#else
|> Shell.CleanDirs
#endif

#if BOOTSTRAP
Shell.cleanDirs [buildDir; testDir; docsDir; apidocsDir; nugetDncDir; nugetLegacyDir; reportDir]
#else
Shell.CleanDirs [buildDir; testDir; docsDir; apidocsDir; nugetDncDir; nugetLegacyDir; reportDir]
#endif

// Clean Data for tests
cleanForTests()
Expand Down Expand Up @@ -357,7 +365,11 @@ Target.create "BuildSolution_" (fun _ ->
)

Target.create "GenerateDocs" (fun _ ->
#if BOOTSTRAP
Shell.cleanDir docsDir
#else
Shell.CleanDir docsDir
#endif
let source = "./help"
let docsTemplate = "docpage.cshtml"
let indexTemplate = "indexpage.cshtml"
Expand All @@ -374,12 +386,20 @@ Target.create "GenerateDocs" (fun _ ->
"project-name", "FAKE - F# Make" ]
let layoutroots = [ "./help/templates"; "./help/templates/reference" ]

#if BOOTSTRAP
Shell.copyDir (docsDir) "help/content" FileFilter.allFiles
#else
Shell.CopyDir (docsDir) "help/content" FileFilter.allFiles
#endif
File.writeString false "./docs/.nojekyll" ""
File.writeString false "./docs/CNAME" "fake.build"
//CopyDir (docsDir @@ "pics") "help/pics" FileFilter.allFiles

#if BOOTSTRAP
Shell.copy (source @@ "markdown") ["RELEASE_NOTES.md"]
#else
Shell.Copy (source @@ "markdown") ["RELEASE_NOTES.md"]
#endif
FSFormatting.createDocs (fun s ->
{ s with
Source = source @@ "markdown"
Expand Down Expand Up @@ -427,7 +447,11 @@ Target.create "GenerateDocs" (fun _ ->
)

Target.create "CopyLicense" (fun _ ->
#if BOOTSTRAP
Shell.copyTo buildDir additionalFiles
#else
Shell.CopyTo buildDir additionalFiles
#endif
)

Target.create "Test" (fun _ ->
Expand Down Expand Up @@ -607,14 +631,22 @@ Target.create "ILRepack" (fun _ ->

if result <> 0 then failwithf "Error during ILRepack execution."

#if BOOTSTRAP
Shell.copyFile (buildDir </> filename) targetFile
#else
Shell.CopyFile (buildDir </> filename) targetFile
#endif

internalizeIn "FAKE.exe"

!! (buildDir </> "FSharp.Compiler.Service.**")
|> Seq.iter File.delete

#if BOOTSTRAP
Shell.deleteDir buildMergedDir
#else
Shell.DeleteDir buildMergedDir
#endif
)

Target.create "CreateNuGet" (fun _ ->
Expand All @@ -640,10 +672,17 @@ Target.create "CreateNuGet" (fun _ ->
let nugetLibDir = nugetLegacyDir @@ "lib"
let nugetLib451Dir = nugetLibDir @@ "net451"

#if BOOTSTRAP
Shell.cleanDir nugetDocsDir
Shell.cleanDir nugetToolsDir
Shell.cleanDir nugetLibDir
Shell.deleteDir nugetLibDir
#else
Shell.CleanDir nugetDocsDir
Shell.CleanDir nugetToolsDir
Shell.CleanDir nugetLibDir
Shell.DeleteDir nugetLibDir
#endif

File.delete "./build/FAKE.Gallio/Gallio.dll"

Expand All @@ -652,6 +691,30 @@ Target.create "CreateNuGet" (fun _ ->
//|> Seq.iter DeleteFile
()

#if BOOTSTRAP
match package with
| p when p = projectName ->
!! (buildDir @@ "**/*.*") |> Shell.copy nugetToolsDir
Shell.copyDir nugetDocsDir docsDir FileFilter.allFiles
deleteFCS nugetToolsDir
| p when p = "FAKE.Core" ->
!! (buildDir @@ "*.*") |> Shell.copy nugetToolsDir
Shell.copyDir nugetDocsDir docsDir FileFilter.allFiles
deleteFCS nugetToolsDir
| p when p = "FAKE.Lib" ->
Shell.cleanDir nugetLib451Dir
{
Globbing.BaseDirectory = buildDir
Globbing.Includes = [ "FakeLib.dll"; "FakeLib.XML" ]
Globbing.Excludes = []
}
|> Shell.copy nugetLib451Dir
deleteFCS nugetLib451Dir
| _ ->
Shell.copyDir nugetToolsDir (buildDir @@ package) FileFilter.allFiles
Shell.copyTo nugetToolsDir additionalFiles
!! (nugetToolsDir @@ "*.srcsv") |> File.deleteAll
#else
match package with
| p when p = projectName ->
!! (buildDir @@ "**/*.*") |> Shell.Copy nugetToolsDir
Expand All @@ -674,6 +737,7 @@ Target.create "CreateNuGet" (fun _ ->
Shell.CopyDir nugetToolsDir (buildDir @@ package) FileFilter.allFiles
Shell.CopyTo nugetToolsDir additionalFiles
!! (nugetToolsDir @@ "*.srcsv") |> File.deleteAll
#endif

let setParams (p:NuGet.NuGet.NuGetParams) =
{p with
Expand Down Expand Up @@ -830,6 +894,7 @@ let executeFPM args =
printfn "%s %s" "fpm" args
Shell.Exec("fpm", args=args, dir="bin")


type SourceType =
| Dir of source:string * target:string
type DebPackageManifest =
Expand Down Expand Up @@ -939,13 +1004,22 @@ Target.create "PublishNuget" (fun _ ->
)

Target.create "ReleaseDocs" (fun _ ->
#if BOOTSTRAP
Shell.cleanDir "gh-pages"
#else
Shell.CleanDir "gh-pages"
#endif
let url = Environment.environVarOrDefault "fake_git_url" "https://github.com/fsharp/FAKE.git"
Git.Repository.cloneSingleBranch "" url "gh-pages" "gh-pages"

Git.Repository.fullclean "gh-pages"
#if BOOTSTRAP
Shell.copyRecursive "docs" "gh-pages" true |> printfn "%A"
Shell.copyFile "gh-pages" "./Samples/FAKE-Calculator.zip"
#else
Shell.CopyRecursive "docs" "gh-pages" true |> printfn "%A"
Shell.CopyFile "gh-pages" "./Samples/FAKE-Calculator.zip"
#endif
Git.Staging.stageAll "gh-pages"
Git.Commit.exec "gh-pages" (sprintf "Update generated documentation %s" release.NugetVersion)
Git.Branches.push "gh-pages"
Expand Down
2 changes: 2 additions & 0 deletions help/markdown/api-slack.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Sending Notifications to a Slack Webhook

**Note: This documentation is for FAKE version 5.0 or later. The old documentation can be found [here](legacy-slacknotification.html)**

In this article you will learn how to create a [Slack](https://slack.com) webhook integration and send a notification to it. This article assumes that you already have a Slack team setup.

**Note: This documentation is for FAKE 5. The old documentation can be found [here](legacy-slacknotification.html)! **
Expand Down
2 changes: 1 addition & 1 deletion help/markdown/buildserver.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Supported Build-Server (Note: Not supported doesn't mean that it won't work, but

- `Fake.BuildServer.AppVeyor`
- `Fake.BuildServer.Travis`
- `Fake.BuildServer.TeamCity`
- `Fake.BuildServer.TeamCity` - [legacy documentation](legacy-teamcity.html)
- `Fake.BuildServer.TeamFoundation`

## General API usage
Expand Down
6 changes: 6 additions & 0 deletions help/markdown/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ We [learned from our mistakes](fake-fake5-learn-more.html), so we use the follow
* We avoid the `Helpers` suffix (because we now expect users to write `<module>.<function>`)
* We generally use the `RequireQualifiedAccess` attribute on modules.

## Guidelines

* Add documentation for your feature
* If you add new markdown documentation make sure to link if from an existing site, ideally add it to the [menu](https://github.com/fsharp/FAKE/blob/master/help/templates/template.cshtml)
* If you write API-Documentation but no extra markdown please consider adding it to the menu as well.

## Porting a module to FAKE 5

As mentioned in the ["Fake 5 learn more"](fake-fake5-learn-more.html) section we have a large list to choose from to help the project. One of these things is porting modules to FAKE 5. To save you from some pitfalls this sections guides you in migrating modules with an (at least for me) working approach.
Expand Down
Loading