Merge pull request #2383 from fsharp/release/next

Release 5.16.1

.circleci/config.yml

@@ -32,7 +32,7 @@ jobs:
           command: |
             apt-get update
             apt-get install -y libunwind8 libicu52 unzip wget git
-            wget https://github.com/fsharp/FAKE/releases/download/5.15.1-alpha.1104/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
+            wget https://github.com/fsharp/FAKE/releases/download/5.16.0/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
             mkdir fake-dotnetcore
             unzip /tmp/fake-dotnetcore-linux-x64.zip -d fake-dotnetcore || echo unzip returned $?
             chmod +x $PWD/fake-dotnetcore/fake

.gitlab-ci.yml

@@ -21,7 +21,7 @@ do_build:
     - "echo 'Package: *\nPin: origin \"archive.debian.org\"\nPin-Priority: 500' | tee -a /etc/apt/preferences.d/10-archive-pin"
     - apt-get update
     - apt-get install -y libunwind8 libicu52 unzip wget git
-    - wget https://github.com/fsharp/FAKE/releases/download/5.15.1-alpha.1104/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
+    - wget https://github.com/fsharp/FAKE/releases/download/5.16.0/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
     - mkdir fake-dotnetcore
     - unzip -n /tmp/fake-dotnetcore-linux-x64.zip -d fake-dotnetcore || echo unzip returned $?
     - chmod +x $PWD/fake-dotnetcore/fake

.travis.yml

@@ -2,7 +2,7 @@ language: csharp
 sudo: required
 dist: xenial # Ubuntu 16.04
 
-dotnet : 2.1.505
+dotnet : 2.1.508
 
 addons:
   apt:
@@ -19,7 +19,7 @@ before_install:
   #- sudo dpkg -i packages-microsoft-prod.deb
   #- sudo apt-get install apt-transport-https -y
   #- sudo apt-get update -y
-  #- sudo apt-get install dotnet-sdk-2.1=2.1.505* -y
+  #- sudo apt-get install dotnet-sdk-2.1=2.1.508* -y
 
 env:
  - FAKE_DETAILED_ERRORS=true HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis

Fake.sln

@@ -958,7 +958,6 @@ Global
 		{9E26B2AE-856A-42B6-9670-8766919F7D25}.Release|x86.ActiveCfg = Release|Any CPU
 		{9E26B2AE-856A-42B6-9670-8766919F7D25}.Release|x86.Build.0 = Release|Any CPU
 		{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|x86.ActiveCfg = Debug|Any CPU

RELEASE_NOTES.md

@@ -1,5 +1,18 @@
 # Release Notes
 
+## 5.16.1 - 2019-08-25
+
+* BUGFIX: Fix that `generate_load_scripts` prevents restore after update - https://github.com/fsharp/FAKE/issues/2382
+* BUGFIX: Fix FAKE unable to load assemblies in some scenarios - https://github.com/fsharp/FAKE/issues/2381
+* BUGFIX: Fix File.getVersion fails if version is not set, thanks @SCullman - https://github.com/fsharp/FAKE/issues/2378
+* ENHANCEMENT: make `Fake.DotNet.Paket` work with the dotnet tool based version of Paket, thanks @seanamosw - https://github.com/fsharp/FAKE/pull/2364
+* ENHANCEMENT: add `Organization` field to `Fake.Testing.SonarQube`, thanks @Lutando - https://github.com/fsharp/FAKE/pull/2358
+* ENHANCEMENT: Added `Arguments.appendRaw*` functions to handle weird microsoft escaping.
+* ENHANCEMENT: Added `Environment.getNuGetPackagesCacheFolder()`, returns the NuGet packages path.
+* ENHANCEMENT: Added `ProcessUtils.tryFindLocalTool` to resolve tools via a common logic (`Fake.IO.Globbing.Tools` is not obsolete)
+* DOCS: Fix some broken links - https://github.com/fsharp/FAKE/issues/2351
+
+
 ## 5.16.0 - 2019-08-17
 
 * LEGACY: Remove `Fake.Deploy` from repository and NuGet package, see https://github.com/fsharp/FAKE/issues/1820

appveyor.yml

@@ -5,7 +5,7 @@ install:
   - ps: |
       Write-Host "Installing .NET SDK..."
       $msiPath = "$($env:USERPROFILE)\dotnet-SDK.exe"
-      (New-Object Net.WebClient).DownloadFile('https://download.visualstudio.microsoft.com/download/pr/4690d405-11c6-488e-b1ba-4f2e9b247b25/7c70d9003e02997b66d843ec54ba53d1/dotnet-sdk-2.1.505-win-x64.exe', $msiPath)
+      (New-Object Net.WebClient).DownloadFile('https://download.visualstudio.microsoft.com/download/pr/2f2d03ef-b000-46a2-abf5-8b863e438568/cddce0caa2526db658e0d21937f89b28/dotnet-sdk-2.1.508-win-x64.exe', $msiPath)
       cmd /c start /wait $msiPath /quiet /norestart
       Write-Host "Installed" -ForegroundColor green
 

global.json

@@ -1,5 +1,5 @@
 {
     "sdk" : {
-        "version": "2.1.505"
+        "version": "2.1.508"
     }
 }

help/templates/template.cshtml

@@ -53,6 +53,7 @@
 						<a href="/fake-template.html" class="navbar-item">FAKE template</a>
 						<a href="/fake-debugging.html" class="navbar-item">Debugging scripts</a>
                         <a href="/fake-completion.html" class="navbar-item">FAKE command-line completion</a>
+						<a href="/fake-fake5-custom-modules.html" class="navbar-item">Create custom modules</a>
 					</div>
 				</div>
 

paket.dependencies

@@ -90,7 +90,6 @@ group Build
     source https://api.nuget.org/v3/index.json
     //source https://ci.appveyor.com/nuget/fake
     //source https://ci.appveyor.com/nuget/fsharp-formatting
-    source https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
 
     nuget FSharp.Core ~> 4.1
     nuget NuGet.CommandLine
@@ -99,7 +98,6 @@ group Build
     nuget FSharp.Formatting.CommandTool prerelease
     nuget SourceLink.Fake
     nuget ILRepack
-    nuget RoslynTools.ReferenceAssemblies
     nuget Newtonsoft.Json
     github fsharp/FAKE modules/Octokit/Octokit.fsx
 
@@ -110,8 +108,7 @@ group NetcoreBuild
     // FAKE_MYGET_FEED (don't edit this line)
     storage: none
 
-    // 2018-07-08: Until we use a runner > 5.1, see https://github.com/fsharp/FAKE/pull/2011
-    nuget FSharp.Core < 4.5
+    nuget FSharp.Core
     nuget Suave
     nuget System.AppContext prerelease
     nuget Paket.Core // prerelease
@@ -159,6 +156,8 @@ group netcorerunner
 
     // Testing
     nuget Expecto >= 5.0
+    nuget YoloDev.Expecto.TestSdk
+    nuget Microsoft.TestPlatform.TestHost
     nuget Expecto.TestResults
     nuget Expecto.FsCheck
     nuget FsCheck