Skip to content

Commit 7ae1597

Browse files
matthidmatthid
committed
Fix build
1 parent efe1cb7 commit 7ae1597

File tree

3 files changed

+161
-158
lines changed

3 files changed

+161
-158
lines changed

‎RELEASE_NOTES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* BUGFIX: Fix unintentional unit return, thanks @objectx - https://github.com/fsharp/FAKE/pull/2534
66
* BUGFIX: Add null check for values with null as default value, thanks @aklefdal - https://github.com/fsharp/FAKE/pull/2531
77
* BUGFIX: Small Copy&Paste issue, thanks @vilinski - https://github.com/fsharp/FAKE/pull/2537
8+
* BUGFIX: Ignore TraceSecret.register call if secret is `null` or empty and throw if replacement is `null`
89

910
## 5.20.2 - 2020-06-27
1011

‎paket.lock‎

Lines changed: 154 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -2857,42 +2857,42 @@ NUGET
28572857
Chessie (0.6)
28582858
FSharp.Core (>= 4.0.1.7-alpha)
28592859
NETStandard.Library (>= 1.6)
2860-
Fake.Api.GitHub (5.20.2)
2861-
FSharp.Core (>= 4.7.2)
2862-
Octokit (>= 0.48)
2863-
Fake.BuildServer.AppVeyor (5.20.2)
2864-
Fake.Core.Environment (>= 5.20.2)
2865-
Fake.Core.Process (>= 5.20.2)
2866-
Fake.Core.String (>= 5.20.2)
2867-
Fake.Core.Trace (>= 5.20.2)
2868-
Fake.IO.FileSystem (>= 5.20.2)
2869-
Fake.Net.Http (>= 5.20.2)
2870-
FSharp.Core (>= 4.7.2)
2871-
Fake.BuildServer.GitLab (5.20.2)
2872-
Fake.Core.Environment (>= 5.20.2)
2873-
Fake.Core.Trace (>= 5.20.2)
2874-
Fake.IO.FileSystem (>= 5.20.2)
2875-
FSharp.Core (>= 4.7.2)
2876-
Fake.BuildServer.TeamCity (5.20.2)
2877-
Fake.Core.Environment (>= 5.20.2)
2878-
Fake.Core.String (>= 5.20.2)
2879-
Fake.Core.Trace (>= 5.20.2)
2880-
Fake.Core.Xml (>= 5.20.2)
2881-
Fake.IO.FileSystem (>= 5.20.2)
2882-
Fake.Net.Http (>= 5.20.2)
2883-
FSharp.Core (>= 4.7.2)
2884-
Fake.BuildServer.TeamFoundation (5.20.2)
2885-
Fake.Core.Environment (>= 5.20.2)
2886-
Fake.Core.String (>= 5.20.2)
2887-
Fake.Core.Trace (>= 5.20.2)
2888-
Fake.Core.Vault (>= 5.20.2)
2889-
Fake.IO.FileSystem (>= 5.20.2)
2890-
FSharp.Core (>= 4.7.2)
2891-
Fake.BuildServer.Travis (5.20.2)
2892-
Fake.Core.Environment (>= 5.20.2)
2893-
Fake.Core.Trace (>= 5.20.2)
2894-
Fake.IO.FileSystem (>= 5.20.2)
2895-
FSharp.Core (>= 4.7.2)
2860+
Fake.Api.GitHub (5.20.1)
2861+
FSharp.Core (>= 4.7.1)
2862+
Octokit (>= 0.47)
2863+
Fake.BuildServer.AppVeyor (5.20.1)
2864+
Fake.Core.Environment (>= 5.20.1)
2865+
Fake.Core.Process (>= 5.20.1)
2866+
Fake.Core.String (>= 5.20.1)
2867+
Fake.Core.Trace (>= 5.20.1)
2868+
Fake.IO.FileSystem (>= 5.20.1)
2869+
Fake.Net.Http (>= 5.20.1)
2870+
FSharp.Core (>= 4.7.1)
2871+
Fake.BuildServer.GitLab (5.20.1)
2872+
Fake.Core.Environment (>= 5.20.1)
2873+
Fake.Core.Trace (>= 5.20.1)
2874+
Fake.IO.FileSystem (>= 5.20.1)
2875+
FSharp.Core (>= 4.7.1)
2876+
Fake.BuildServer.TeamCity (5.20.1)
2877+
Fake.Core.Environment (>= 5.20.1)
2878+
Fake.Core.String (>= 5.20.1)
2879+
Fake.Core.Trace (>= 5.20.1)
2880+
Fake.Core.Xml (>= 5.20.1)
2881+
Fake.IO.FileSystem (>= 5.20.1)
2882+
Fake.Net.Http (>= 5.20.1)
2883+
FSharp.Core (>= 4.7.1)
2884+
Fake.BuildServer.TeamFoundation (5.20.1)
2885+
Fake.Core.Environment (>= 5.20.1)
2886+
Fake.Core.String (>= 5.20.1)
2887+
Fake.Core.Trace (>= 5.20.1)
2888+
Fake.Core.Vault (>= 5.20.1)
2889+
Fake.IO.FileSystem (>= 5.20.1)
2890+
FSharp.Core (>= 4.7.1)
2891+
Fake.BuildServer.Travis (5.20.1)
2892+
Fake.Core.Environment (>= 5.20.1)
2893+
Fake.Core.Trace (>= 5.20.1)
2894+
Fake.IO.FileSystem (>= 5.20.1)
2895+
FSharp.Core (>= 4.7.1)
28962896
Fake.Core.CommandLineParsing (5.20.2)
28972897
FParsec (>= 1.1.1)
28982898
FSharp.Core (>= 4.7.2)
@@ -2903,32 +2903,32 @@ NUGET
29032903
Fake.Core.FakeVar (5.20.2)
29042904
Fake.Core.Context (>= 5.20.2)
29052905
FSharp.Core (>= 4.7.2)
2906-
Fake.Core.Process (5.20.2)
2907-
Fake.Core.Environment (>= 5.20.2)
2908-
Fake.Core.FakeVar (>= 5.20.2)
2909-
Fake.Core.String (>= 5.20.2)
2910-
Fake.Core.Trace (>= 5.20.2)
2911-
Fake.IO.FileSystem (>= 5.20.2)
2912-
FSharp.Core (>= 4.7.2)
2913-
System.Collections.Immutable (>= 1.7.1)
2914-
Fake.Core.ReleaseNotes (5.20.2)
2915-
Fake.Core.SemVer (>= 5.20.2)
2916-
Fake.Core.String (>= 5.20.2)
2917-
FSharp.Core (>= 4.7.2)
2918-
Fake.Core.SemVer (5.20.2)
2919-
FSharp.Core (>= 4.7.2)
2906+
Fake.Core.Process (5.20.1)
2907+
Fake.Core.Environment (>= 5.20.1)
2908+
Fake.Core.FakeVar (>= 5.20.1)
2909+
Fake.Core.String (>= 5.20.1)
2910+
Fake.Core.Trace (>= 5.20.1)
2911+
Fake.IO.FileSystem (>= 5.20.1)
2912+
FSharp.Core (>= 4.7.1)
2913+
System.Collections.Immutable (>= 1.7)
2914+
Fake.Core.ReleaseNotes (5.20.1)
2915+
Fake.Core.SemVer (>= 5.20.1)
2916+
Fake.Core.String (>= 5.20.1)
2917+
FSharp.Core (>= 4.7.1)
2918+
Fake.Core.SemVer (5.20.1)
2919+
FSharp.Core (>= 4.7.1)
29202920
Fake.Core.String (5.20.2)
29212921
FSharp.Core (>= 4.7.2)
2922-
Fake.Core.Target (5.20.2)
2923-
Fake.Core.CommandLineParsing (>= 5.20.2)
2924-
Fake.Core.Context (>= 5.20.2)
2925-
Fake.Core.Environment (>= 5.20.2)
2926-
Fake.Core.FakeVar (>= 5.20.2)
2927-
Fake.Core.Process (>= 5.20.2)
2928-
Fake.Core.String (>= 5.20.2)
2929-
Fake.Core.Trace (>= 5.20.2)
2930-
FSharp.Control.Reactive (>= 4.4)
2931-
FSharp.Core (>= 4.7.2)
2922+
Fake.Core.Target (5.20.1)
2923+
Fake.Core.CommandLineParsing (>= 5.20.1)
2924+
Fake.Core.Context (>= 5.20.1)
2925+
Fake.Core.Environment (>= 5.20.1)
2926+
Fake.Core.FakeVar (>= 5.20.1)
2927+
Fake.Core.Process (>= 5.20.1)
2928+
Fake.Core.String (>= 5.20.1)
2929+
Fake.Core.Trace (>= 5.20.1)
2930+
FSharp.Control.Reactive (>= 4.2)
2931+
FSharp.Core (>= 4.7.1)
29322932
Fake.Core.Tasks (5.20.2)
29332933
Fake.Core.Trace (>= 5.20.2)
29342934
FSharp.Core (>= 4.7.2)
@@ -2942,109 +2942,109 @@ NUGET
29422942
Fake.Core.Xml (5.20.2)
29432943
Fake.Core.String (>= 5.20.2)
29442944
FSharp.Core (>= 4.7.2)
2945-
Fake.DotNet.AssemblyInfoFile (5.20.2)
2946-
Fake.Core.Environment (>= 5.20.2)
2947-
Fake.Core.String (>= 5.20.2)
2948-
Fake.Core.Trace (>= 5.20.2)
2949-
Fake.IO.FileSystem (>= 5.20.2)
2950-
FSharp.Core (>= 4.7.2)
2951-
Fake.DotNet.Cli (5.20.2)
2952-
Fake.Core.Environment (>= 5.20.2)
2953-
Fake.Core.Process (>= 5.20.2)
2954-
Fake.Core.String (>= 5.20.2)
2955-
Fake.Core.Trace (>= 5.20.2)
2956-
Fake.DotNet.MSBuild (>= 5.20.2)
2957-
Fake.DotNet.NuGet (>= 5.20.2)
2958-
Fake.IO.FileSystem (>= 5.20.2)
2959-
FSharp.Core (>= 4.7.2)
2945+
Fake.DotNet.AssemblyInfoFile (5.20.1)
2946+
Fake.Core.Environment (>= 5.20.1)
2947+
Fake.Core.String (>= 5.20.1)
2948+
Fake.Core.Trace (>= 5.20.1)
2949+
Fake.IO.FileSystem (>= 5.20.1)
2950+
FSharp.Core (>= 4.7.1)
2951+
Fake.DotNet.Cli (5.20.1)
2952+
Fake.Core.Environment (>= 5.20.1)
2953+
Fake.Core.Process (>= 5.20.1)
2954+
Fake.Core.String (>= 5.20.1)
2955+
Fake.Core.Trace (>= 5.20.1)
2956+
Fake.DotNet.MSBuild (>= 5.20.1)
2957+
Fake.DotNet.NuGet (>= 5.20.1)
2958+
Fake.IO.FileSystem (>= 5.20.1)
2959+
FSharp.Core (>= 4.7.1)
29602960
Mono.Posix.NETStandard (>= 1.0)
29612961
Newtonsoft.Json (>= 12.0.3)
2962-
Fake.DotNet.FSFormatting (5.20.2)
2963-
Fake.Core.Process (>= 5.20.2)
2964-
Fake.DotNet.Cli (>= 5.20.2)
2965-
Fake.IO.FileSystem (>= 5.20.2)
2966-
FSharp.Core (>= 4.7.2)
2967-
Fake.DotNet.MSBuild (5.20.2)
2968-
BlackFox.VsWhere (>= 1.1)
2969-
Fake.Core.Environment (>= 5.20.2)
2970-
Fake.Core.Process (>= 5.20.2)
2971-
Fake.Core.String (>= 5.20.2)
2972-
Fake.Core.Trace (>= 5.20.2)
2973-
Fake.IO.FileSystem (>= 5.20.2)
2974-
FSharp.Core (>= 4.7.2)
2975-
MSBuild.StructuredLogger (>= 2.1.133)
2976-
Fake.DotNet.NuGet (5.20.2)
2977-
Fake.Core.Environment (>= 5.20.2)
2978-
Fake.Core.Process (>= 5.20.2)
2979-
Fake.Core.SemVer (>= 5.20.2)
2980-
Fake.Core.String (>= 5.20.2)
2981-
Fake.Core.Tasks (>= 5.20.2)
2982-
Fake.Core.Trace (>= 5.20.2)
2983-
Fake.Core.Xml (>= 5.20.2)
2984-
Fake.IO.FileSystem (>= 5.20.2)
2985-
Fake.Net.Http (>= 5.20.2)
2986-
FSharp.Core (>= 4.7.2)
2962+
Fake.DotNet.FSFormatting (5.20.1)
2963+
Fake.Core.Process (>= 5.20.1)
2964+
Fake.DotNet.Cli (>= 5.20.1)
2965+
Fake.IO.FileSystem (>= 5.20.1)
2966+
FSharp.Core (>= 4.7.1)
2967+
Fake.DotNet.MSBuild (5.20.1)
2968+
BlackFox.VsWhere (>= 1.0)
2969+
Fake.Core.Environment (>= 5.20.1)
2970+
Fake.Core.Process (>= 5.20.1)
2971+
Fake.Core.String (>= 5.20.1)
2972+
Fake.Core.Trace (>= 5.20.1)
2973+
Fake.IO.FileSystem (>= 5.20.1)
2974+
FSharp.Core (>= 4.7.1)
2975+
MSBuild.StructuredLogger (>= 2.1.117)
2976+
Fake.DotNet.NuGet (5.20.1)
2977+
Fake.Core.Environment (>= 5.20.1)
2978+
Fake.Core.Process (>= 5.20.1)
2979+
Fake.Core.SemVer (>= 5.20.1)
2980+
Fake.Core.String (>= 5.20.1)
2981+
Fake.Core.Tasks (>= 5.20.1)
2982+
Fake.Core.Trace (>= 5.20.1)
2983+
Fake.Core.Xml (>= 5.20.1)
2984+
Fake.IO.FileSystem (>= 5.20.1)
2985+
Fake.Net.Http (>= 5.20.1)
2986+
FSharp.Core (>= 4.7.1)
29872987
Newtonsoft.Json (>= 12.0.3)
2988-
NuGet.Protocol (>= 5.6)
2989-
Fake.DotNet.Paket (5.20.2)
2990-
Fake.Core.Process (>= 5.20.2)
2991-
Fake.Core.String (>= 5.20.2)
2992-
Fake.Core.Trace (>= 5.20.2)
2993-
Fake.DotNet.Cli (>= 5.20.2)
2994-
Fake.IO.FileSystem (>= 5.20.2)
2995-
FSharp.Core (>= 4.7.2)
2996-
Fake.DotNet.Testing.MSpec (5.20.2)
2997-
Fake.Core.Environment (>= 5.20.2)
2998-
Fake.Core.Process (>= 5.20.2)
2999-
Fake.Core.String (>= 5.20.2)
3000-
Fake.Core.Trace (>= 5.20.2)
3001-
Fake.IO.FileSystem (>= 5.20.2)
3002-
Fake.Testing.Common (>= 5.20.2)
3003-
FSharp.Core (>= 4.7.2)
3004-
Fake.DotNet.Testing.NUnit (5.20.2)
3005-
Fake.Core.Environment (>= 5.20.2)
3006-
Fake.Core.Process (>= 5.20.2)
3007-
Fake.Core.String (>= 5.20.2)
3008-
Fake.Core.Trace (>= 5.20.2)
3009-
Fake.IO.FileSystem (>= 5.20.2)
3010-
Fake.Testing.Common (>= 5.20.2)
3011-
FSharp.Core (>= 4.7.2)
3012-
Fake.DotNet.Testing.XUnit2 (5.20.2)
3013-
Fake.Core.Process (>= 5.20.2)
3014-
Fake.Core.String (>= 5.20.2)
3015-
Fake.Core.Trace (>= 5.20.2)
3016-
Fake.IO.FileSystem (>= 5.20.2)
3017-
Fake.Testing.Common (>= 5.20.2)
3018-
FSharp.Core (>= 4.7.2)
3019-
Fake.IO.FileSystem (5.20.2)
3020-
Fake.Core.String (>= 5.20.2)
3021-
FSharp.Core (>= 4.7.2)
3022-
Fake.IO.Zip (5.20.2)
3023-
Fake.Core.String (>= 5.20.2)
3024-
Fake.IO.FileSystem (>= 5.20.2)
3025-
FSharp.Core (>= 4.7.2)
2988+
NuGet.Protocol (>= 5.5.1)
2989+
Fake.DotNet.Paket (5.20.1)
2990+
Fake.Core.Process (>= 5.20.1)
2991+
Fake.Core.String (>= 5.20.1)
2992+
Fake.Core.Trace (>= 5.20.1)
2993+
Fake.DotNet.Cli (>= 5.20.1)
2994+
Fake.IO.FileSystem (>= 5.20.1)
2995+
FSharp.Core (>= 4.7.1)
2996+
Fake.DotNet.Testing.MSpec (5.20.1)
2997+
Fake.Core.Environment (>= 5.20.1)
2998+
Fake.Core.Process (>= 5.20.1)
2999+
Fake.Core.String (>= 5.20.1)
3000+
Fake.Core.Trace (>= 5.20.1)
3001+
Fake.IO.FileSystem (>= 5.20.1)
3002+
Fake.Testing.Common (>= 5.20.1)
3003+
FSharp.Core (>= 4.7.1)
3004+
Fake.DotNet.Testing.NUnit (5.20.1)
3005+
Fake.Core.Environment (>= 5.20.1)
3006+
Fake.Core.Process (>= 5.20.1)
3007+
Fake.Core.String (>= 5.20.1)
3008+
Fake.Core.Trace (>= 5.20.1)
3009+
Fake.IO.FileSystem (>= 5.20.1)
3010+
Fake.Testing.Common (>= 5.20.1)
3011+
FSharp.Core (>= 4.7.1)
3012+
Fake.DotNet.Testing.XUnit2 (5.20.1)
3013+
Fake.Core.Process (>= 5.20.1)
3014+
Fake.Core.String (>= 5.20.1)
3015+
Fake.Core.Trace (>= 5.20.1)
3016+
Fake.IO.FileSystem (>= 5.20.1)
3017+
Fake.Testing.Common (>= 5.20.1)
3018+
FSharp.Core (>= 4.7.1)
3019+
Fake.IO.FileSystem (5.20.1)
3020+
Fake.Core.String (>= 5.20.1)
3021+
FSharp.Core (>= 4.7.1)
3022+
Fake.IO.Zip (5.20.1)
3023+
Fake.Core.String (>= 5.20.1)
3024+
Fake.IO.FileSystem (>= 5.20.1)
3025+
FSharp.Core (>= 4.7.1)
30263026
Fake.Net.Http (5.20.2)
30273027
Fake.Core.Trace (>= 5.20.2)
30283028
FSharp.Core (>= 4.7.2)
30293029
Fake.Testing.Common (5.20.2)
30303030
Fake.Core.Trace (>= 5.20.2)
30313031
FSharp.Core (>= 4.7.2)
3032-
Fake.Tools.Git (5.20.2)
3033-
Fake.Core.Environment (>= 5.20.2)
3034-
Fake.Core.Process (>= 5.20.2)
3035-
Fake.Core.SemVer (>= 5.20.2)
3036-
Fake.Core.String (>= 5.20.2)
3037-
Fake.Core.Trace (>= 5.20.2)
3038-
Fake.IO.FileSystem (>= 5.20.2)
3039-
FSharp.Core (>= 4.7.2)
3040-
Fake.Windows.Chocolatey (5.20.2)
3041-
Fake.Core.Environment (>= 5.20.2)
3042-
Fake.Core.Process (>= 5.20.2)
3043-
Fake.Core.String (>= 5.20.2)
3044-
Fake.Core.Trace (>= 5.20.2)
3045-
Fake.DotNet.NuGet (>= 5.20.2)
3046-
Fake.IO.FileSystem (>= 5.20.2)
3047-
FSharp.Core (>= 4.7.2)
3032+
Fake.Tools.Git (5.20.1)
3033+
Fake.Core.Environment (>= 5.20.1)
3034+
Fake.Core.Process (>= 5.20.1)
3035+
Fake.Core.SemVer (>= 5.20.1)
3036+
Fake.Core.String (>= 5.20.1)
3037+
Fake.Core.Trace (>= 5.20.1)
3038+
Fake.IO.FileSystem (>= 5.20.1)
3039+
FSharp.Core (>= 4.7.1)
3040+
Fake.Windows.Chocolatey (5.20.1)
3041+
Fake.Core.Environment (>= 5.20.1)
3042+
Fake.Core.Process (>= 5.20.1)
3043+
Fake.Core.String (>= 5.20.1)
3044+
Fake.Core.Trace (>= 5.20.1)
3045+
Fake.DotNet.NuGet (>= 5.20.1)
3046+
Fake.IO.FileSystem (>= 5.20.1)
3047+
FSharp.Core (>= 4.7.1)
30483048
FParsec (1.1.1)
30493049
FSharp.Core (>= 4.3.4)
30503050
FSharp.Control.Reactive (4.4.2)

‎src/app/Fake.Core.Trace/TraceListener.fs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,12 @@ module TraceSecrets =
322322
| None -> []
323323

324324
let register replacement secret =
325-
getAll()
326-
|> List.filter (fun s -> s.Value <> secret)
327-
|> fun l -> { Value = secret; Replacement = replacement } :: l
328-
|> fun l -> setTraceSecrets l
325+
if isNull replacement then invalidArg "replacement" "replacement cannot be null"
326+
if not <| String.IsNullOrEmpty(secret) then
327+
getAll()
328+
|> List.filter (fun s -> s.Value <> secret)
329+
|> fun l -> { Value = secret; Replacement = replacement } :: l
330+
|> setTraceSecrets
329331

330332
let guardMessage (s:string) =
331333
getAll()

0 commit comments

Comments
 (0)