Date: Sat, 11 Aug 2018 14:58:36 +0200
Subject: [PATCH 10/14] docs
---
help/markdown/fake-dotnetcore.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/help/markdown/fake-dotnetcore.md b/help/markdown/fake-dotnetcore.md
index 09a89ff19bf..5dd83e1b4ce 100644
--- a/help/markdown/fake-dotnetcore.md
+++ b/help/markdown/fake-dotnetcore.md
@@ -22,7 +22,7 @@ Just install the corresponding package for your system:
- choco install fake -pre
+ choco install fake
@@ -35,10 +35,14 @@ Just install the corresponding package for your system:
- dotnet tool install fake-cli -g --version=5.*
+ dotnet tool install fake-cli -g
+- Debian package
+
+ - the .deb file can be downloaded from the [releases-page](https://github.com/fsharp/FAKE/releases)
+
- Others
We currently do not have packages for the various distributions, look for [other ways to install fake](fake-gettingstarted.html#Install-FAKE).
From 4135c3ba072e6d2b5b55f6f786c6db8bc1e47f9a Mon Sep 17 00:00:00 2001
From: Matthias Dittrich
Date: Sat, 11 Aug 2018 15:06:53 +0200
Subject: [PATCH 11/14] oO
---
build.fsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.fsx b/build.fsx
index 73b277f6c78..d7710e3b534 100644
--- a/build.fsx
+++ b/build.fsx
@@ -808,6 +808,7 @@ Target.create "DotNetCoreCreateDebianPackage" (fun _ ->
sprintf "/p:TargetFramework=%s" targetFramework
sprintf "/p:CustomTarget=%s" "CreateDeb"
sprintf "/p:RuntimeIdentifier=%s" runtime
+ sprintf "/p:RuntimeIdentifiers=%s" runtime
sprintf "/p:Configuration=%s" "Release"
sprintf "/p:PackageVersion=%s" simpleVersion
] |> String.concat " "
From 951d89ef9a34fe25e8e5706563b66f2e2a94982d Mon Sep 17 00:00:00 2001
From: Matthias Dittrich
Date: Sat, 11 Aug 2018 16:02:16 +0200
Subject: [PATCH 12/14] add restore to the same msbuild call :/
---
build.fsx | 8 +-------
src/app/fake-cli/fake-cli.fsproj | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/build.fsx b/build.fsx
index d7710e3b534..6b13fedd5f0 100644
--- a/build.fsx
+++ b/build.fsx
@@ -795,20 +795,14 @@ Target.create "CheckReleaseSecrets" (fun _ ->
Target.create "DotNetCoreCreateDebianPackage" (fun _ ->
- DotNet.restore (fun opt ->
- { opt with
- Common = { opt.Common with WorkingDirectory = "src/app/fake-cli/" } |> dtntSmpl
- Runtime = Some "linux-x64"}) "fake-cli.fsproj"
-
let runtime = "linux-x64"
let targetFramework = "netcoreapp2.1"
let args =
[
- sprintf "/t:%s" "CreateDeb"
+ sprintf "/t:%s" "Restore;CreateDeb"
sprintf "/p:TargetFramework=%s" targetFramework
sprintf "/p:CustomTarget=%s" "CreateDeb"
sprintf "/p:RuntimeIdentifier=%s" runtime
- sprintf "/p:RuntimeIdentifiers=%s" runtime
sprintf "/p:Configuration=%s" "Release"
sprintf "/p:PackageVersion=%s" simpleVersion
] |> String.concat " "
diff --git a/src/app/fake-cli/fake-cli.fsproj b/src/app/fake-cli/fake-cli.fsproj
index 725bc6139df..83009af59a7 100644
--- a/src/app/fake-cli/fake-cli.fsproj
+++ b/src/app/fake-cli/fake-cli.fsproj
@@ -11,7 +11,7 @@
- win7-x86;win7-x64;osx.10.11-x64;linux-x64
+ linux-x64
/opt/fake
From ab10ea6d928dfc3431adc6554a25debda06e13f2 Mon Sep 17 00:00:00 2001
From: Matthias Dittrich
Date: Sat, 11 Aug 2018 18:00:01 +0200
Subject: [PATCH 13/14] fix docs.
---
help/markdown/dotnet-cli.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/help/markdown/dotnet-cli.md b/help/markdown/dotnet-cli.md
index 050f8663552..c64d0171c57 100644
--- a/help/markdown/dotnet-cli.md
+++ b/help/markdown/dotnet-cli.md
@@ -10,7 +10,7 @@ nuget Fake.DotNet.Cli //"
open Fake.DotNet
// Lazily install DotNet SDK in the correct version if not available
-let install = lazy DotNet.Install DotNet.Release_2_1_4
+let install = lazy DotNet.install DotNet.Versions.Release_2_1_4
// Define general properties across various commands (with arguments)
let inline withWorkDir wd =
From 66c6938c274ef949b6ce0672afe799806a0ac287 Mon Sep 17 00:00:00 2001
From: Matthias Dittrich
Date: Sat, 11 Aug 2018 18:18:43 +0200
Subject: [PATCH 14/14] release 5.4.0
---
RELEASE_NOTES.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 08e6761a447..b1c06e13796 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,9 +1,10 @@
# Release Notes
-## 5.4.0-alpha - vnext
+## 5.4.0 - 2018-08-11
* ENHANCEMENT: Template always uses latest version now - https://github.com/fsharp/FAKE/pull/2055
-* ENHANCEMENT: Add all environment variables - https://github.com/fsharp/FAKE/pull/2059
+* ENHANCEMENT: Add all GITLAB environment variables - https://github.com/fsharp/FAKE/pull/2059
+* ENHANCEMENT: Support naming of artifacts in TFS/VSTS - https://github.com/fsharp/FAKE/pull/2056
* BUGFIX: Use UTF8 without BOM by default - https://github.com/fsharp/FAKE/issues/2032
* BUGFIX: Improve error message when starting dotnet-cli with incorrect working directory - https://github.com/fsharp/FAKE/issues/2046