Merge pull request #2292 from fsharp/release/next

Release  5.13.1

.travis.yml

@@ -1,18 +1,29 @@
 language: csharp
 sudo: required
-dist: trusty # Ubuntu 14.04
-dotnet : 2.1.402
-env:
- - FAKE_DETAILED_ERRORS=true HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis
+dist: xenial # Ubuntu 16.04
 
+dotnet : 2.1.505
+
+addons:
+  apt:
+    packages:
+      - build-essential
+      - ruby
+      - ruby-dev
+      - rubygems-integration
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update               ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl      ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --force openssl ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gnu-tar      ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt update; sudo apt install ruby ruby-dev rubygems-integration build-essential -y ; fi 
-  - gem install --no-ri --no-rdoc fpm
+  - gem install --no-ri --no-rdoc fpm 
+
+  #- wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+  #- 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
+
+env:
+ - FAKE_DETAILED_ERRORS=true HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis
+
 
 mono:
   - 5.18.1

RELEASE_NOTES.md

@@ -1,9 +1,15 @@
 # Release Notes
 
-## 5.13.1-alpha - tbd
+## 5.13.2-alpha - tbd
 
+* ENHANCEMENT: Update .NET Core runtime
 * tbd
 
+## 5.13.1 - 2019-04-22
+
+* ENHANCEMENT: Support F# 4.6 syntax in scripts
+* ENHANCEMENT: Add hint when runner is older than 6 months and warning after 12 months
+
 ## 5.13.0 - 2019-04-14
 
 * NEW: Add dotnet nuget push command and arguments - https://github.com/fsharp/FAKE/pull/2229

appveyor.yml

@@ -1,13 +1,20 @@
 image: Visual Studio 2017
 install:
   - cinst fake
+  # from https://stackoverflow.com/questions/33897161/appveyor-build-error-msb3774-could-not-find-sdk-microsoft-admediator-universal/33897162#33897162
+  - 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)
+      cmd /c start /wait $msiPath /quiet /norestart
+      Write-Host "Installed" -ForegroundColor green
+
 build_script:
-# See https://stackoverflow.com/a/12866669/1269722
-# Problem is that colors are lost
-# Don't blame me but powershell is the bigest crap on earth
+  # See https://stackoverflow.com/a/12866669/1269722
+  # Problem is that colors are lost
+  # Don't blame me but powershell is the bigest crap on earth
   - cmd: fake.exe run build.fsx --parallel 3
-
-#  - ps: .\build.cmd
+  #- ps: .\build.cmd
 on_failure:
   - appveyor PushArtifact FAKE.svclog
 test: off

build.fsx

@@ -229,7 +229,8 @@ let common = [
     AssemblyInfo.Product "FAKE - F# Make"
     AssemblyInfo.Version release.AssemblyVersion
     AssemblyInfo.InformationalVersion nugetVersion
-    AssemblyInfo.FileVersion nugetVersion]
+    AssemblyInfo.FileVersion nugetVersion
+    AssemblyInfo.Metadata("BuildDate", System.DateTime.UtcNow.ToString("yyyy-MM-dd")) ]
 
 // New FAKE libraries
 let dotnetAssemblyInfos =
@@ -415,6 +416,13 @@ Target.create "DownloadPaket" (fun _ ->
     callpaket "." "--version"
 )
 
+Target.create "UnskipAssemblyInfo" (fun _ ->
+    for assemblyFile, _ in assemblyInfos do
+        // Unskip assemblyinfos, needed if you want to checkin changes...
+        Git.CommandHelper.directRunGitCommandAndFail "." (sprintf "update-index --no-skip-worktree %s" assemblyFile)
+        ()
+)
+
 Target.create "UnskipAndRevertAssemblyInfo" (fun _ ->
     for assemblyFile, _ in assemblyInfos do
         // While the files are skipped in can be hard to switch between branches

global.json

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

integrationtests/core-reference-fake-core-targets/before/reference_fake-targets.fsx

@@ -21,7 +21,7 @@ printfn "test_before targets"
 Target.create "Start" (fun _ -> ())
 
 Target.create "TestTarget" (fun p ->
-    printfn "Starting Build."
+    printfn "Starting Build %A." {| test = "anon_record_f#-4.6" |}
     Trace.traceFAKE "Some Info from FAKE"
     printfn "Arguments: %A" p.Context.Arguments
     printfn "Ending Build."

paket.dependencies

@@ -72,8 +72,6 @@ nuget System.Reactive.Compatibility
 // From FSharp.Compiler.Service, but manually managed because of rename
 nuget System.ValueTuple copy_local: true, redirects:force
 
-github matthid/Yaaf.FSharp.Scripting src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs
-
 group DocsLegacyV4
     source https://api.nuget.org/v3/index.json
     nuget FAKE ~> 4.0
@@ -155,6 +153,15 @@ group netcorerunner
     nuget Microsoft.NETCore.App framework: netstandard1.6, netstandard2.0, netcoreapp1.1
     nuget NETStandard.Library  ~> 2.0
     nuget Packaging.Targets
+    nuget FSharp.Compiler.Service content: none
+    nuget Microsoft.DotNet.PlatformAbstractions ~> 2.0
+
+    // Testing
+    nuget Expecto >= 5.0
+    nuget Expecto.TestResults
+    nuget Expecto.FsCheck
+    nuget FsCheck
+    nuget FParsec // commandline tests
 
 group netcore
     //source https://ci.appveyor.com/nuget/paket
@@ -163,11 +170,10 @@ group netcore
     framework: net46, net462, netstandard1.6, netstandard2.0, netcoreapp2.0, netcoreapp2.1
 
     nuget DotNet.Xdt
-    nuget Microsoft.NETCore.App framework: netstandard1.6, netstandard2.0, netcoreapp1.1
-    nuget FSharp.Compiler.Service storage: packages, content: none
-    nuget Microsoft.DotNet.PlatformAbstractions ~> 2.0
+    nuget FSharp.Compiler.Service content: none
 
     nuget NETStandard.Library ~> 2.0
+
     // Starting from 2018-07-08 this needs to be <4.5 to not break 5.0 and 5.1 releases
     // After some time we can upgrade this (and consolidate the netcore and netcorerunner groups)
     // but not before 2018-11
@@ -188,12 +194,6 @@ group netcore
         nuget Microsoft.Build.Utilities.Core < 16
     nuget BlackFox.VsWhere
 
-    // Testing
-    nuget Expecto >= 5.0
-    nuget Expecto.TestResults
-    nuget Expecto.FsCheck
-    nuget FsCheck
-
     nuget System.Runtime.Numerics
     nuget System.Xml.XPath
     nuget System.Xml.XPath.XDocument