Merge pull request #2539 from fsharp/release/next

Release 5.20.4
fsprojects · Mar 31, 2021 · 13eee5a · 13eee5a
2 parents a210a98 + 2f3f006
commit 13eee5a
Show file tree

Hide file tree

Showing 36 changed files with 10,682 additions and 1,377 deletions.
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
@@ -1,6 +1,7 @@
 name: Greetings
 
-on: [pull_request, issues]
+#on: [pull_request, issues]
+on: [issues]
 
 jobs:
   greeting:
@@ -10,4 +11,4 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         issue-message: 'Welcome to the FAKE community! Thank you so much for creating your first issue and therefore improving the project!'
-        pr-message: 'Welcome to the FAKE community! Thank you so much for directly helping to improve FAKE! You are now in good company and we hope this only the first in a long list of contributions :)'
+        #pr-message: 'Welcome to the FAKE community! Thank you so much for directly helping to improve FAKE! You are now in good company and we hope this only the first in a long list of contributions :)'
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 Thumbs.db
 .DS_Store
 #Ignore files build by Visual Studio
+.fsdocs/
+output/
 docs/
 docsBuild/
 report/

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: csharp
 sudo: required
 dist: xenial # Ubuntu 16.04
 
-dotnet: 3.1.100
+dotnet: 3.1.201
 
 addons:
   apt:

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,14 @@
 # Release Notes
 
+## 5.20.4 - 2021-03-31
+
+* ENHANCEMENT: Allow users of nunit3 set environment variables in the runner, thanks @robertpi - https://github.com/fsharp/FAKE/pull/2543
+* BUGFIX: Fix reportgenerator docs and compilation,thanks @matthid - https://github.com/fsharp/FAKE/issues/2535
+* BUGFIX: Fix Travis build, thanks @gdziadkiewicz - https://github.com/fsharp/FAKE/pull/2549
+* BUGIFX: Update Paket.Core to (better) support net5.0, thanks @pchinery - https://github.com/fsharp/FAKE/pull/2556
+* BUGFIX: fix build by using Suave version to 2.5.6 in build script which is compatible with netstandard 2.0, thanks @yazeedobaid https://github.com/fsharp/FAKE/pull/2574
+* ENHANCEMENT: Change NuGet feed APIs to use V3 of NuGet feed APIs, thanks @yazeedobaid https://github.com/fsharp/FAKE/pull/2574
+
 ## 5.20.3 - 2020-08-05
 
 * BUGFIX: Fix unintentional unit return, thanks @objectx - https://github.com/fsharp/FAKE/pull/2534

diff --git a/build.fsx b/build.fsx
@@ -31,7 +31,7 @@ nuget Fake.Windows.Chocolatey prerelease
 nuget Fake.Tools.Git prerelease
 nuget Mono.Cecil prerelease
 nuget System.Reactive.Compatibility
-nuget Suave
+nuget Suave 2.5.6
 nuget Newtonsoft.Json
 nuget Octokit //"
 #endif

diff --git a/help/markdown/testing-reportgenerator.md b/help/markdown/testing-reportgenerator.md
@@ -19,30 +19,20 @@ See https://github.com/danielpalme/ReportGenerator
 ## Minimal working example
 
 ```fsharp
-"#r "paket:
+"#r paket:
 nuget Fake.Core.Target
 nuget Fake.Testing.ReportGenerator"
 
 open Fake.Core
 open Fake.Core.TargetOperators
 open Fake.Testing
 
-...
-
 Target.create "Generate Reports" (fun _ ->
-   let parameters p = { p with TargetDir = "c:/reports/" }
    !! "**/opencover.xml"
-   |> ReportGenerator.generateReports parameters
+   |> Seq.toList
+   |> ReportGenerator.generateReports (fun p -> { p with TargetDir = "c:/reports/" })
  )
 
-Target.create "Default" DoNothing
-
-"Clean"
-  ==> "SetAssemblyInfo"
-  ==> "Build"
-  ==> "RunCoverage"
-  ==> "Generate Reports"
-  ==> "Default"
 
-Target.runOrDefault "Default"
+Target.runOrDefault "Generate Reports"
 ```
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,4 +1,4 @@
-version 5.249.0
+version 5.251.0
 content: none
 //source C:\Users\matth\.nuget\localsource
 source https://api.nuget.org/v3/index.json
@@ -27,8 +27,13 @@ nuget SSH.NET
 nuget Microsoft.Web.Administration
 nuget Mono.Web.Xdt
 nuget Mono.Cecil prerelease
-nuget Nuget.Core
-nuget Nuget.Protocol
+nuget NuGet.Core
+nuget NuGet.Protocol < 5.7
+nuget NuGet.Packaging < 5.7
+nuget NuGet.Common < 5.7
+nuget NuGet.Configuration < 5.7
+nuget NuGet.Frameworks < 5.7
+nuget NuGet.Versioning < 5.7
 nuget FParsec
 nuget bootstrap
 nuget Knockout.Mapping
@@ -64,7 +69,7 @@ nuget FluentMigrator.Runner.SQLite
 nuget FluentMigrator.Runner.SqlServer
 nuget FluentMigrator.Runner.SqlServerCe
 nuget HashLib
-nuget FSharp.Compiler.Service content: none
+nuget FSharp.Compiler.Service < 37 content: none 
 nuget Octokit
 nuget System.Net.Http
 nuget Microsoft.DotNet.PlatformAbstractions
@@ -113,7 +118,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)
@@ -180,7 +185,8 @@ group netcore
     nuget Octokit
     nuget Newtonsoft.Json
     nuget Paket.Core // prerelease
-    nuget NuGet.Protocol
+    nuget NuGet.Protocol < 5.7
+    nuget NuGet.Packaging < 5.7
     nuget Mono.Cecil prerelease
     nuget Mono.Posix.NETStandard
     nuget FSharp.Control.Reactive