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 5.13.1 #2292

Merged
merged 33 commits into from
Apr 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
647cec4
fix output in test
matthid Apr 14, 2019
7abed0b
Merge branch 'master' of github.com:fsharp/FAKE into release/next
matthid Apr 17, 2019
952cd47
paket update
matthid Apr 17, 2019
456547c
.
matthid Apr 17, 2019
555d860
Support F# 4.6
matthid Apr 22, 2019
9f00bfc
Add hint when runner is older than 6 months
matthid Apr 22, 2019
4de0ea9
properly bundle YaafFSharpScripting.fs instead of pseudo-bundle
matthid Apr 22, 2019
f252546
release notes 5.13.2
matthid Apr 22, 2019
034a7ae
update to SDK LTS (2.1.506)
matthid Apr 22, 2019
c7888ee
update assembly infos
matthid Apr 22, 2019
4ee6769
fix unit tests
matthid Apr 22, 2019
fdad06b
Fix travis build
matthid Apr 22, 2019
df8ce99
next release
matthid Apr 22, 2019
f818062
try to fix travis
matthid Apr 22, 2019
61bb69c
Do not print dotnet --version errors, fixes https://github.com/fsharp…
matthid Apr 22, 2019
2389d17
Merge branch 'release/next' into travis
matthid Apr 22, 2019
fba0b4a
try next
matthid Apr 22, 2019
c6587ed
fix appveyor
matthid Apr 22, 2019
619ef4e
install microsoft feed
matthid Apr 22, 2019
c6dacb5
try again
matthid Apr 22, 2019
4d5342b
fix compilation
matthid Apr 22, 2019
959570b
add norestart flag
matthid Apr 22, 2019
66f08d7
downgrade to 505, see https://github.com/dotnet/core/issues/2555#issu…
matthid Apr 22, 2019
704c63d
Merge branch 'travis' into appveyor
matthid Apr 22, 2019
3367a07
use 505
matthid Apr 22, 2019
c27696c
Merge branch 'release/next' into appveyor
matthid Apr 22, 2019
eb83872
fix build
matthid Apr 22, 2019
a06b52e
Merge branch 'release/next' into appveyor
matthid Apr 22, 2019
22088e8
Merge branch 'release/next' into travis
matthid Apr 22, 2019
a9525d5
cleanup
matthid Apr 22, 2019
e59204c
Merge branch 'appveyor' into release/next
matthid Apr 22, 2019
75f7e80
fix release notes
matthid Apr 22, 2019
6cfca95
release notes
matthid Apr 22, 2019
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
31 changes: 21 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 7 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
17 changes: 12 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 9 additions & 1 deletion build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk" : {
"version": "2.1.402"
"version": "2.1.505"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

This file was deleted.

22 changes: 11 additions & 11 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading