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.19.1 #2446

Merged
merged 40 commits into from
Feb 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
31a9374
Add support for MSBuild16
BlythMeister Mar 15, 2019
0087ff2
RELEASE_NOTES
forki Mar 19, 2019
6a77437
next release
matthid Dec 19, 2019
5f96577
Update indexpage.cshtml
ncave Dec 25, 2019
d8ec1d1
Update MSTest.fs
0x53A Jan 3, 2020
b387227
minor typo in docs (indexpage.cshtml) (#2449)
matthid Jan 6, 2020
da285c4
Update MSTest.fs for VS 2019 (#2450)
matthid Jan 6, 2020
75f9f8b
fix release notes docs
matthid Jan 11, 2020
3b0a8aa
Merge branch 'release/next' of github.com:fsharp/FAKE into release/next
matthid Jan 11, 2020
8334f68
Pass instance of Diagnostics.Process for created process for function…
maciej-izak Jan 13, 2020
4344fb1
fix bug reported on gitter
matthid Jan 13, 2020
92d560f
Update keepachangelog.com URL to latest version
rmunn Jan 14, 2020
f17c4f6
* Introduce new addOnStartedEx with simple record StartedProcessInfo …
maciej-izak Jan 14, 2020
436de84
Move type outside the module and make contructor internal
matthid Jan 14, 2020
54f4db6
It's `InternalProcess` now
matthid Jan 14, 2020
67bd5ab
Merge branch 'master' of github.com:fsharp/FAKE into release/next
matthid Jan 15, 2020
0e31bf1
fix test
matthid Jan 15, 2020
9d8e73c
Merge branch 'release/next' of github.com:fsharp/FAKE into release/next
matthid Jan 15, 2020
f27f619
fix test
matthid Jan 15, 2020
a780d51
Merge branch 'release/next' into addOnStarted-p-param
matthid Jan 15, 2020
9770ecc
Update keepachangelog.com URL to latest version (#2452)
matthid Jan 15, 2020
48f0c8b
Merge pull request #2451 from maciej-izak/addOnStarted-p-param
matthid Jan 16, 2020
218424b
Use HTTPS for all links
jeremyabbott Jan 18, 2020
bc8533c
Fix typo in CLI help message
mjul Jan 27, 2020
45e7b68
Merge pull request #1 from mjul/mjul-fix-typo-in-cli-help-message
mjul Jan 27, 2020
c3b9a70
Merge pull request #2454 from jeremyabbott/patch-1
matthid Jan 27, 2020
01b4c7b
Merge pull request #2459 from mjul/release/next
matthid Jan 27, 2020
54bdaf0
fix contributing links
smoothdeveloper Jan 28, 2020
7435c54
Add DynamicsNAV 365 Business Central Spring release support
part-timeDev Jan 29, 2020
1131977
Merge pull request #2461 from part-timeDev/hotfix_fake4
forki Jan 30, 2020
8e91980
Ignore ionide
forki Jan 30, 2020
5365526
Merge branch 'hotfix_fake4' of https://github.com/fsharp/FAKE into ho…
forki Jan 30, 2020
b1700c6
RELEASE_NOTES
forki Jan 30, 2020
3873279
Use stable version of the reference assemblies package.
teo-tsirpanis Jan 30, 2020
bb21e4f
Merge pull request #2460 from smoothdeveloper/patch-1
matthid Feb 9, 2020
e50ca50
Merge pull request #2463 from teo-tsirpanis/patch-2
matthid Feb 9, 2020
26e872c
Release notes
matthid Feb 9, 2020
5b48c17
release notes
matthid Feb 9, 2020
d5a4763
Merge branch 'hotfix_fake4' of github.com:fsharp/FAKE into release/next
matthid Feb 9, 2020
d92c062
`dotnet-fake` cli tool via `DotNetCliToolReference` is now history - …
matthid Feb 9, 2020
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
15 changes: 0 additions & 15 deletions Fake.sln
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Xamarin", "src\
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Net.Http", "src\app\Fake.Net.Http\Fake.Net.Http.fsproj", "{D24CEE35-B6C0-4C92-AE18-E80F90B69974}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "dotnet-fake", "src\app\dotnet-fake\dotnet-fake.fsproj", "{DB27F0BB-D546-42B2-85DA-52870B4424FD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.UnitTests", "src\test\Fake.Core.UnitTests\Fake.Core.UnitTests.fsproj", "{31A5759B-B562-43C0-A845-14EFA4091543}"
Expand Down Expand Up @@ -627,18 +625,6 @@ Global
{D24CEE35-B6C0-4C92-AE18-E80F90B69974}.Release|x64.Build.0 = Release|Any CPU
{D24CEE35-B6C0-4C92-AE18-E80F90B69974}.Release|x86.ActiveCfg = Release|Any CPU
{D24CEE35-B6C0-4C92-AE18-E80F90B69974}.Release|x86.Build.0 = Release|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Debug|x64.ActiveCfg = Debug|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Debug|x64.Build.0 = Debug|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Debug|x86.ActiveCfg = Debug|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Debug|x86.Build.0 = Debug|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Release|Any CPU.Build.0 = Release|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Release|x64.ActiveCfg = Release|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Release|x64.Build.0 = Release|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Release|x86.ActiveCfg = Release|Any CPU
{DB27F0BB-D546-42B2-85DA-52870B4424FD}.Release|x86.Build.0 = Release|Any CPU
{31A5759B-B562-43C0-A845-14EFA4091543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31A5759B-B562-43C0-A845-14EFA4091543}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31A5759B-B562-43C0-A845-14EFA4091543}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1195,7 +1181,6 @@ Global
{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{D24CEE35-B6C0-4C92-AE18-E80F90B69974} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{DB27F0BB-D546-42B2-85DA-52870B4424FD} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{31A5759B-B562-43C0-A845-14EFA4091543} = {CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18}
{D8850C67-0542-427A-ABCB-92174EA42C95} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Visual Studio or MonoDevelop, which provide syntax highlighting and code complet

The new DSL was designed to be succinct, typed, declarative, extensible and easy to use.

See the [project home page](https://fake.build/) for tutorials and [API documentation](http://fake.build/apidocs/v5/index.html).
See the [project home page](https://fake.build/) for tutorials and [API documentation](https://fake.build/apidocs/v5/index.html).

## Build the project

* Either: Download and install the [Dotnet SDK](https://www.microsoft.com/net/learn/get-started) and run `dotnet tool restore` followed by `dotnet fake build`
* Or: Install FAKE 5 (for example via `choco install fake -pre`) and run `fake build`

> Note: You can find more details on the [contributing page](http://fsharp.github.com/FAKE/contributing.html)
> Note: You can find more details on the [contributing page](https://fake.build/contributing.html)

Make sure to have long path enabled: https://superuser.com/questions/1119883/windows-10-enable-ntfs-long-paths-policy-option-missing
Otherwise the test-suite will fail (However, the compilation should work)
Expand All @@ -29,8 +29,8 @@ Otherwise the test-suite will fail (However, the compilation should work)

## How to contribute code

See the [contributing page](http://fsharp.github.com/FAKE/contributing.html).
See the [contributing page](https://fake.build/contributing.html).

## Maintainers

Although this project is hosted in the [fsharp](https://github.com/fsharp) repository for historical reasons, it is _not_ maintained and managed by the F# Core Engineering Group. The F# Core Engineering Group acknowledges that the independent owner and maintainer of this project is [Steffen Forkmann](http://github.com/forki).
Although this project is hosted in the [fsharp](https://github.com/fsharp) repository for historical reasons, it is _not_ maintained and managed by the F# Core Engineering Group. The F# Core Engineering Group acknowledges that the independent owner and maintainer of this project is [Steffen Forkmann](https://github.com/forki).
27 changes: 21 additions & 6 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
# Release Notes

## 5.19.1 - 2019-02-10

* ANNOUNCEMENT: `dotnet-fake` cli tool via `DotNetCliToolReference` is now history - https://github.com/fsharp/FAKE/issues/2465
* ENHANCEMENT: Update MSTest.fs for VS 2019, thanks @0x53A - https://github.com/fsharp/FAKE/pull/2450
* ENHANCEMENT: Added `CreateProcess.addOnStartedEx` in order to retrieve the .NET Process object, thanks @maciej-izak - https://github.com/fsharp/FAKE/pull/2451
* BUGFIX: Improved error reporting when paket initialization fails, see https://github.com/isaacabraham/vsts-fsharp/issues/33
* DOCS: Fixed typos and improved docs, thanks @ncave, @rmunn, @jeremyabbott, @mjul, @smoothdeveloper - https://github.com/fsharp/FAKE/pull/2449 https://github.com/fsharp/FAKE/pull/2452 https://github.com/fsharp/FAKE/pull/2454 https://github.com/fsharp/FAKE/pull/2459 https://github.com/fsharp/FAKE/pull/2460
* INFRASTRUCTURE: Use stable version of reference assemblies package, thanks @teo-tsirpanis - https://github.com/fsharp/FAKE/pull/2463

## 5.19.0 - 2019-12-19

* NEW: Added `Fake.Sql.SqlPackage` which is a redesign or `Fake.Sql.DacPac` and added support for publish profiles, thanks @kmadof - https://github.com/fsharp/FAKE/pull/2366
* EHNANCEMENT: `Fake.DotNet.Cli` Add timeout field to kill the process after the given timeout - https://github.com/fsharp/FAKE/pull/2425
* EHNANCEMENT: `Fake.Core.Target` Add notification when a fake worker is idle - https://github.com/fsharp/FAKE/pull/2425
* EHNANCEMENT: Use SPDX license expressions in the nuspec files, thanks @teo-tsirpanis - https://github.com/fsharp/FAKE/pull/2403
* ENHANCEMENT: `Fake.DotNet.Cli` Add timeout field to kill the process after the given timeout - https://github.com/fsharp/FAKE/pull/2425
* ENHANCEMENT: `Fake.Core.Target` Add notification when a fake worker is idle - https://github.com/fsharp/FAKE/pull/2425
* ENHANCEMENT: Use SPDX license expressions in the nuspec files, thanks @teo-tsirpanis - https://github.com/fsharp/FAKE/pull/2403
* ENHANCEMENT: `fake-cli` Update bundled paket - https://github.com/fsharp/FAKE/pull/2425
* ENHANCEMENT: `Fake.DotNet.Cli` Add support for suppressing copyright messages (`--nologo`) when invoking `dotnet`, thanks @objectx - https://github.com/fsharp/FAKE/pull/2436
* EHNANCEMENT: `Fake.Installer.Squirrel` Add additional Squirrel parameters, thanks @pchinery - https://github.com/fsharp/FAKE/pull/2431
* EHNANCEMENT: `Fake.Testing.SonarQube` Several improvements like workdir and local tool support, thanks @vilinski - https://github.com/fsharp/FAKE/pull/2438
* ENHANCEMENT: `Fake.Installer.Squirrel` Add additional Squirrel parameters, thanks @pchinery - https://github.com/fsharp/FAKE/pull/2431
* ENHANCEMENT: `Fake.Testing.SonarQube` Several improvements like workdir and local tool support, thanks @vilinski - https://github.com/fsharp/FAKE/pull/2438
* BUGFIX: `Fake.Tools.Rsync` Fix typo in Rsync.fs options, thanks @rmunn - https://github.com/fsharp/FAKE/pull/2432
* BUGFIX: `Fake.DotNet.Testing.Coverlet` Fix Coverlet output property name, thanks @SteveGilham - https://github.com/fsharp/FAKE/pull/2427
* BUGFIX: `Fake.Tools.Octo` Octopus deploy trace always marked failures, thanks @ids-pfinn - https://github.com/fsharp/FAKE/pull/2428
Expand Down Expand Up @@ -191,7 +200,13 @@
* DOCS: Resort TraceSecrets.register indexed parameters - https://github.com/fsharp/FAKE/pull/2254
* DOCS: fix broken links #2241 - https://github.com/fsharp/FAKE/pull/2241

## 4.64.16 - 2019-02-15
#### 4.64.18 - 2020-01-30
* Add Dynamics Business Central 365 support

#### 4.64.17 - 2019-03-19
* Add support for MSBuild16

#### 4.64.16 - 2019-02-15
* Add Dynamics NAV FullCompile function

## 4.64.14 - 2019-01-07
Expand Down
3 changes: 1 addition & 2 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,7 @@ let common = [

// New FAKE libraries
let dotnetAssemblyInfos =
[ "dotnet-fake", "Fake dotnet-cli command line tool"
"fake-cli", "Fake global dotnet-cli command line tool"
[ "fake-cli", "Fake global dotnet-cli command line tool"
"Fake.Api.GitHub", "GitHub Client API Support via Octokit"
"Fake.Api.HockeyApp", "HockeyApp Integration Support"
"Fake.Api.Slack", "Slack Integration Support"
Expand Down
4 changes: 0 additions & 4 deletions help/markdown/fake-gettingstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ There are various ways to install FAKE 5:
<p>These scripts have no versioning story. You either need to take care of versions yourself (and lock them) or your builds might break on major releases.</p>
</div>

* (No longer recommended) Use it as a dotnet tool (legacy): Add `<DotNetCliToolReference Include="dotnet-fake" Version="5.*" />` to your dependencies and run `dotnet fake ...` instead of `fake ...`, see [this example](https://github.com/FakeBuild/fake-bootstrap/blob/master/dotnet-fake.csproj)

* (No longer recommended) Bootstrap via paket `clitool` (legacy), this is basically the same as `DotNetCliToolReference` but managed via paket. See the [`paket_clitool`](https://github.com/FakeBuild/fake-bootstrap/tree/paket_clitool) branch of `fake-bootstrap` in particular the [build.proj](https://github.com/FakeBuild/fake-bootstrap/blob/paket_clitool/build.proj) file.

now you can use

<pre><code class="lang-bash">fake --help</code></pre>
Expand Down
3 changes: 1 addition & 2 deletions help/markdown/fake-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Specifies your prefered way to bootstrap FAKE.

- `local` (default) - Installs the FAKE dotnet sdk local tool into the `dotnet-tools.json` manifest. This requires an dotnet SDK version 3 or higher.
- `tool` - Installs the FAKE dotnet sdk global tool into the `--tool-path` folder
- `project` - Creates a `build.proj` and uses `DotNetCliToolReference` to bootstrap FAKE
- `none` - Does not bootstrap FAKE. Use this if you want to use a global installation of FAKE

### --dependencies
Expand All @@ -51,4 +50,4 @@ Specifies your prefered way to define build tasks inside your build script:
Specifies the folder for the fake-cli tool. This parameter is only applicable when `tool` option is used for bootstrapping with `--bootstrap`. Defaults to `.fake`.

### --version
Specifies the version of FAKE to install. Defaults to `5.*`. This parameter is only applicable when either `local`, `tool` or `project` is used for bootstrapping.
Specifies the version of FAKE to install. Defaults to `5.*`. This parameter is only applicable when either `local` or `tool` is used for bootstrapping.
4 changes: 2 additions & 2 deletions help/templates/indexpage.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
<div class="column is-6">
<h3 class="title is-3 is-spaced">Target dependencies</h3>
<h5 class="subtitle is-5">Targets in your build script might have dependencies on other targets
like cleaning up your output folder before building your app. FAKE supports specifing
dependenies between your targets. While it might look a bit strange at first, just read it from
like cleaning up your output folder before building your app. FAKE supports specifying
dependencies between your targets. While it might look a bit strange at first, just read it from
the bottom to the top.</h5>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb; $(AllowedOutputExtensionsInPackageBuildOutputFolder)</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
</Project>
22 changes: 19 additions & 3 deletions src/app/Fake.Core.Process/CreateProcess.fs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ type CreateProcess<'TRes> =
member x.WorkingDirectory = x.InternalWorkingDirectory
member x.Environment = x.InternalEnvironment

/// Some information regaring the started process
type StartedProcessInfo =
internal {
InternalProcess : Process
}
member x.Process = x.InternalProcess

/// Module for creating and modifying CreateProcess<'TRes> instances.
/// You can manage:
Expand Down Expand Up @@ -173,8 +179,8 @@ module CreateProcess =
|> EnvMap.ofSeq
|> Some
Streams =
{ StandardInput = if p.RedirectStandardError then CreatePipe StreamRef.Empty else Inherit
StandardOutput = if p.RedirectStandardError then CreatePipe StreamRef.Empty else Inherit
{ StandardInput = if p.RedirectStandardInput then CreatePipe StreamRef.Empty else Inherit
StandardOutput = if p.RedirectStandardOutput then CreatePipe StreamRef.Empty else Inherit
StandardError = if p.RedirectStandardError then CreatePipe StreamRef.Empty else Inherit
}
Hook = emptyHook
Expand Down Expand Up @@ -333,14 +339,24 @@ module CreateProcess =
(fun state p -> ())
(fun prev state exitCode -> prev)
(fun _ -> f ())
/// Execute the given function right after the process is started.
/// Execute the given function right after the process is started.
let addOnStarted f (c:CreateProcess<_>) =
c
|> appendSimpleFuncs
ignore
(fun state p -> f ())
(fun prev state exitCode -> prev)
ignore

/// Execute the given function right after the process is started.
/// PID for process can be obtained from p parameter (p.Process.Id).
let addOnStartedEx (f:StartedProcessInfo -> _) (c:CreateProcess<_>) =
c
|> appendSimpleFuncs
ignore
(fun state p -> f { InternalProcess = p })
(fun prev state exitCode -> prev)
ignore

/// Sets the given environment variables
let withEnvironment (env: (string * string) list) (c:CreateProcess<_>)=
Expand Down
2 changes: 1 addition & 1 deletion src/app/Fake.Core.ReleaseNotes/Changelog.fs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// Contains helpers which allow to parse Change log text files.
/// These files have to be in a format as described on http://keepachangelog.com/en/0.1.0/
/// These files have to be in a format as described on http://keepachangelog.com/en/1.1.0/
///
/// ## Sample
///
Expand Down
9 changes: 5 additions & 4 deletions src/app/Fake.Core.ReleaseNotes/ReleaseNotes.fs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
///
/// ## Sample
///
/// let release =
/// ReadFile "RELEASE_NOTES.md"
/// |> ReleaseNotesHelper.parseReleaseNotes
///
///
/// #r "paket:
/// nuget Fake.Core.ReleaseNotes //"
///
/// let release = ReleaseNotes.load "RELEASE_NOTES.md"
///
/// Target "AssemblyInfo" (fun _ ->
/// CreateFSharpAssemblyInfo "src/Common/AssemblyInfo.fs"
Expand Down
5 changes: 4 additions & 1 deletion src/app/Fake.DotNet.Testing.MSTest/MSTest.fs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ open Fake.Testing.Common

/// [omit]
let mstestPaths =
[| @"[ProgramFilesX86]\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\";
[| @"[ProgramFilesX86]\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Professional\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Community\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Professional\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Community\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio 14.0\Common7\IDE";
Expand Down
4 changes: 0 additions & 4 deletions src/app/Fake.Runtime/FakeRuntimeHints.fs
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,6 @@ let retrieveHints (prepareInfo:FakeRuntime.PrepareInfo) (context:FakeContext) (r
[
if findException (fun e -> e :? MissingMethodException) err then
yield { Important = false; Text = "The given error might indicate a problem with the fake cache. Backup the '.fake' directory, delete it and try again. If it works or you need help consider reporting a new issue." }
if err |> findException (function
| :? FileNotFoundException as f when f.Message.Contains "System.Memory" -> true
| _ -> false) then
yield { Important = true; Text = "The error might indicate that you are using dotnet-fake with an incorrect project file.\nTry adding '<DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>' to your project file, see https://github.com/fsharp/FAKE/issues/2097 for details." }
if not config.VerboseLevel.PrintVerbose && Environment.GetEnvironmentVariable "FAKE_DETAILED_ERRORS" <> "true" then
yield { Important = false; Text = "To further diagnose the problem you can run fake in verbose mode `fake -v run ...` or set the 'FAKE_DETAILED_ERRORS' environment variable to 'true'" }

Expand Down
2 changes: 1 addition & 1 deletion src/app/Fake.Tools.Octo/Octo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ type PushOptions = {
/// if the package already exists, should this package overwrite it?
ReplaceExisting : bool
/// Common parameters
Common: Options}
Common: Options }

/// Option type for selecting one command
type internal Command =
Expand Down
2 changes: 1 addition & 1 deletion src/app/Fake.netcore/Cli.fs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let fakeArgsHint =
"""
General:

Fake command line is devided into runtime and script arguments.
The Fake command line is divided into runtime and script arguments.
Runtime arguments control compilation and processing of the script,
while script arguments are specific for the script or provided by
a NuGet package.
Expand Down
29 changes: 21 additions & 8 deletions src/app/Fake.netcore/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -209,19 +209,28 @@ type CliAction =
| ShowHelp
| InvalidUsage of string

let handleAction (verboseLevel:VerboseLevel) (action:CliAction) =
let private initPaket (verboseLevel:VerboseLevel) =
if verboseLevel.PrintPaket then
Paket.Logging.verbose <- true
Paket.Logging.verboseWarnings <- true
Paket.Utils.autoAnswer <- Some true
// When silent we don't want Paket output
if verboseLevel.PrintNormal then
Paket.Logging.event.Publish
|> Observable.subscribe Paket.Logging.traceToConsole
else
{ new System.IDisposable with
member __.Dispose() = () }

exception PaketInitException of Exception

let handleAction (verboseLevel:VerboseLevel) (action:CliAction) =

use consoleTrace =
// When silent we don't want Paket output
if verboseLevel.PrintNormal then
Paket.Logging.event.Publish
|> Observable.subscribe Paket.Logging.traceToConsole
else
{ new System.IDisposable with
member __.Dispose() = () }
try initPaket verboseLevel
with e ->
// Hard to debug, see https://github.com/isaacabraham/vsts-fsharp/issues/33
raise (PaketInitException e)

match action with
| ShowVersion ->
Expand Down Expand Up @@ -313,6 +322,10 @@ let main (args:string[]) =
parseAction rawResults
exitCode <- handleAction verbLevel results
with
| PaketInitException exn ->
printfn "Error while initializing Paket.Core (please report this to Paket):"
reportExn VerboseLevel.VerbosePaket exn
exitCode <- 1
| exn ->
printfn "Error while parsing command line, usage is:"
printf "%s" Cli.fakeArgsHint
Expand Down
Loading