Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release/next' into align-fsc-w…
Browse files Browse the repository at this point in the history
…ith-docs-fsprojects#2395
  • Loading branch information
wallymathieu committed Oct 9, 2019
2 parents 2a4cdb1 + fe01ddf commit 3783192
Show file tree
Hide file tree
Showing 26 changed files with 3,753 additions and 1,980 deletions.
2 changes: 0 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ See the [project home page](https://fake.build/) for tutorials and [API document
Make sure to have long path enabled: https://superuser.com/questions/1119883/windows-10-enable-ntfs-long-paths-policy-option-missing
Otherwise the test-suite will fail (However, the compilation should work)

[![Issue Stats](http://www.issuestats.com/github/fsharp/FAKE/badge/pr)](http://www.issuestats.com/github/fsharp/FAKE) [![Issue Stats](http://www.issuestats.com/github/fsharp/FAKE/badge/issue)](http://www.issuestats.com/github/fsharp/FAKE)

[![NuGet Badge](https://buildstats.info/nuget/FAKE)](https://www.nuget.org/packages/FAKE)
[![NuGet Badge](https://buildstats.info/nuget/Fake.Core.Target)](https://www.nuget.org/packages/Fake.Core.Target) [![NuGet Badge](https://buildstats.info/nuget/Fake.Core.Context)](https://www.nuget.org/packages/Fake.Core.Context)

Expand Down
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 5.16.2-alpha - tbd

* DOCS: Remove Issue Stats, thanks @vbfox - https://github.com/fsharp/FAKE/pull/2393
* ENHANCEMENT: Support VSTest parallel test execution setting, thanks @dungpa - https://github.com/fsharp/FAKE/pull/2385
* ENHANCEMENT: Update dotnet new template, thanks @Krzysztof-Cieslak - https://github.com/fsharp/FAKE/pull/2391

* tbd.

## 5.16.1 - 2019-08-25
Expand Down
6 changes: 3 additions & 3 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ let projectSummary = "FAKE - F# Make - Get rid of the noise in your build script
let projectDescription = "FAKE - F# Make - is a build automation tool for .NET. Tasks and dependencies are specified in a DSL which is integrated in F#."
let authors = ["Steffen Forkmann"; "Mauricio Scheffer"; "Colin Bull"; "Matthias Dittrich"]

// The name of the project on GitHub
let gitName = "FAKE"

let release = ReleaseNotes.load "RELEASE_NOTES.md"

let buildDir = "./build"
Expand Down Expand Up @@ -101,6 +98,9 @@ let getVarOrDefault name def = ``Legacy-build``.getVarOrDefault name def
let releaseSecret replacement name = ``Legacy-build``.releaseSecret replacement name

let github_release_user = getVarOrDefault "github_release_user" "fsharp"

// The name of the project on GitHub
let gitName = getVarOrDefault "github_repository_name" "FAKE"
let nugetsource = getVarOrDefault "nugetsource" "https://www.nuget.org/api/v2/package"
let chocosource = getVarOrDefault "chocosource" "https://push.chocolatey.org/"
let artifactsDir = getVarOrDefault "artifactsdirectory" ""
Expand Down
8 changes: 4 additions & 4 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ source https://api.nuget.org/v3/index.json
nuget FSharp.Core ~> 4.1 redirects: force
nuget Knockout
nuget NuGet.CommandLine
nuget Paket.Core // prerelease
nuget Paket.Core prerelease
nuget RavenDB.Server
nuget serilog.sinks.nlog 1.5.4
nuget Argu >= 3.3.0
Expand Down Expand Up @@ -111,7 +111,7 @@ group NetcoreBuild
nuget FSharp.Core
nuget Suave
nuget System.AppContext prerelease
nuget Paket.Core // prerelease
nuget Paket.Core prerelease
nuget Fake.Api.GitHub prerelease // FAKE_VERSION (don't edit this line)
nuget Fake.Core.Target prerelease // FAKE_VERSION (don't edit this line)
nuget Fake.Core.SemVer prerelease // FAKE_VERSION (don't edit this line)
Expand Down Expand Up @@ -146,7 +146,7 @@ group netcorerunner
framework: net462, netstandard2.0, netcoreapp2.0, netcoreapp2.1
nuget FSharp.Core

nuget Paket.Core
nuget Paket.Core prerelease
nuget Mono.Cecil
nuget Microsoft.NETCore.App framework: netstandard1.6, netstandard2.0, netcoreapp1.1
nuget NETStandard.Library ~> 2.0
Expand Down Expand Up @@ -179,7 +179,7 @@ group netcore
nuget FParsec
nuget Octokit
nuget Newtonsoft.Json
nuget Paket.Core // prerelease
nuget Paket.Core prerelease
nuget NuGet.Protocol ~> 4.0 strategy: min // To support net462...
nuget Mono.Cecil prerelease
nuget FSharp.Control.Reactive
Expand Down
3,252 changes: 1,539 additions & 1,713 deletions paket.lock

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/app/Fake.Core.Process/RawProc.fs
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ module internal RawProc =
Trace.traceFAKE "At least one redirection task did not finish: \nReadErrorTask: %O, ReadOutputTask: %O, RedirectStdInTask: %O" readErrorTask.Status readOutputTask.Status redirectStdInTask.Status
allFinished <- ok

if not allFinished && Environment.GetEnvironmentVariable("FAKE_DEBUG_PROCESS_HANG") = "true" then
if Environment.GetEnvironmentVariable("FAKE_ATTACH_DEBUGGER") = "true" then
System.Diagnostics.Debugger.Launch() |> ignore
System.Diagnostics.Debugger.Break() |> ignore
Environment.FailFast(sprintf "At least one redirection task did not finish: \nReadErrorTask: %O, ReadOutputTask: %O, RedirectStdInTask: %O" readErrorTask.Status readOutputTask.Status redirectStdInTask.Status)

// wait for finish -> AwaitTask has a bug which makes it unusable for chanceled tasks.
// workaround with continuewith
let! streams = all.ContinueWith (new System.Func<System.Threading.Tasks.Task<Stream[]>, Stream[]> (fun t -> t.GetAwaiter().GetResult())) |> Async.AwaitTaskWithoutAggregate
Expand Down
Loading

0 comments on commit 3783192

Please sign in to comment.