diff --git a/src/app/Fake.Core.CommandLineParsing/docopt.fs/Docopt/Docopt.fs b/src/app/Fake.Core.CommandLineParsing/docopt.fs/Docopt/Docopt.fs index ee65aad45c1..0b07c3473de 100644 --- a/src/app/Fake.Core.CommandLineParsing/docopt.fs/Docopt/Docopt.fs +++ b/src/app/Fake.Core.CommandLineParsing/docopt.fs/Docopt/Docopt.fs @@ -105,6 +105,7 @@ type Docopt(doc', ?soptChars':string) = |> addKey opt.DefaultValue opt.FullLong |> addKey opt.DefaultValue opt.FullShort ) map) result + member this.Parse(argv':#seq) = this.Parse(argv' |> Seq.toArray) member __.Usage = String.Join("\n", uStrs) member __.UsageParser = pusage diff --git a/src/app/Fake.DotNet.Cli/DotNet.fs b/src/app/Fake.DotNet.Cli/DotNet.fs index 4b5274119dd..e0f1e8e3686 100644 --- a/src/app/Fake.DotNet.Cli/DotNet.fs +++ b/src/app/Fake.DotNet.Cli/DotNet.fs @@ -1645,7 +1645,7 @@ module DotNet = |> List.concat |> List.filter (not << String.IsNullOrEmpty) - /// nuget push paramters for `dotnet nuget push` + /// nuget push parameters for `dotnet nuget push` type NuGetPushOptions = { Common: Options PushParams: NuGet.NuGetPushParams } @@ -1681,6 +1681,9 @@ module DotNet = use __ = Trace.traceTask "DotNet:nuget:push" nupkg let param = NuGetPushOptions.Create() |> setParams let pushParams = param.PushParams + pushParams.ApiKey |> Option.iter (fun key -> TraceSecrets.register "" key) + pushParams.SymbolApiKey |> Option.iter (fun key -> TraceSecrets.register "" key) + let args = Args.toWindowsCommandLine (nupkg :: buildNugetPushArgs pushParams) let result = exec (fun _ -> param.Common) "nuget push" args diff --git a/src/app/Fake.DotNet.NuGet/NuGet.fs b/src/app/Fake.DotNet.NuGet/NuGet.fs index 4cea4240f0f..cc076d55562 100644 --- a/src/app/Fake.DotNet.NuGet/NuGet.fs +++ b/src/app/Fake.DotNet.NuGet/NuGet.fs @@ -315,8 +315,8 @@ let private propertiesParam = function /// Creates a NuGet package without templating (including symbols package if enabled) let private pack parameters nuspecFile = - TraceSecrets.register parameters.AccessKey "" - TraceSecrets.register parameters.SymbolAccessKey "" + TraceSecrets.register "" parameters.AccessKey + TraceSecrets.register "" parameters.SymbolAccessKey let nuspecFile = Path.getFullName nuspecFile let properties = propertiesParam parameters.Properties let basePath = parameters.BasePath |> Option.map (sprintf "-BasePath \"%s\"") |> Option.defaultValue "" @@ -433,8 +433,8 @@ let internal toPushCliArgs param = |> List.filter (not << String.IsNullOrEmpty) let rec private push (options : ToolOptions) (parameters : NuGetPushParams) nupkg = - parameters.ApiKey |> Option.iter (fun key -> TraceSecrets.register key "") - parameters.SymbolApiKey |> Option.iter (fun key -> TraceSecrets.register key "") + parameters.ApiKey |> Option.iter (fun key -> TraceSecrets.register "" key) + parameters.SymbolApiKey |> Option.iter (fun key -> TraceSecrets.register "" key) let pushArgs = parameters |> toPushCliArgs |> Args.toWindowsCommandLine let args = sprintf "%s \"%s\" %s" options.Command nupkg pushArgs diff --git a/src/app/Fake.DotNet.NuGet/NuGetVersion.fs b/src/app/Fake.DotNet.NuGet/NuGetVersion.fs index 958ab33a6f8..ff00f942ae2 100644 --- a/src/app/Fake.DotNet.NuGet/NuGetVersion.fs +++ b/src/app/Fake.DotNet.NuGet/NuGetVersion.fs @@ -21,17 +21,17 @@ type NuGetVersionIncrement = SemVerInfo -> SemVerInfo /// Increment patch version let IncPatch:NuGetVersionIncrement = fun (v:SemVerInfo) -> - { v with Build=0I; Patch=(v.Patch+1u) } + { v with Build=0I; Patch=(v.Patch+1u); Original = None } /// Increment minor version let IncMinor:NuGetVersionIncrement = fun (v:SemVerInfo) -> - { v with Build=0I; Patch=0u; Minor=(v.Minor+1u) } + { v with Build=0I; Patch=0u; Minor=(v.Minor+1u); Original = None } /// Increment major version let IncMajor:NuGetVersionIncrement = fun (v:SemVerInfo) -> - { v with Build=0I; Patch=0u; Minor=0u; Major=(v.Major+1u) } + { v with Build=0I; Patch=0u; Minor=0u; Major=(v.Major+1u); Original = None } /// Arguments for the next NuGet version number computing type NuGetVersionArg = diff --git a/src/app/Fake.DotNet.Paket/Paket.fs b/src/app/Fake.DotNet.Paket/Paket.fs index 2fe7dc7da51..ff859d2c38b 100644 --- a/src/app/Fake.DotNet.Paket/Paket.fs +++ b/src/app/Fake.DotNet.Paket/Paket.fs @@ -178,12 +178,12 @@ let pack setParams = let pushFiles setParams files = let parameters : PaketPushParams = PaketPushDefaults() |> setParams - TraceSecrets.register parameters.ApiKey "" + TraceSecrets.register "" parameters.ApiKey match Environment.environVarOrNone "nugetkey" with - | Some k -> TraceSecrets.register k "" + | Some k -> TraceSecrets.register "" k | None -> () match Environment.environVarOrNone "nuget-key" with - | Some k -> TraceSecrets.register k "" + | Some k -> TraceSecrets.register "" k | None -> () let packages = Seq.toList files diff --git a/src/test/Fake.Core.UnitTests/Fake.DotNet.NuGet.fs b/src/test/Fake.Core.UnitTests/Fake.DotNet.NuGet.fs index 713e8957752..6a948970f8b 100644 --- a/src/test/Fake.Core.UnitTests/Fake.DotNet.NuGet.fs +++ b/src/test/Fake.Core.UnitTests/Fake.DotNet.NuGet.fs @@ -2,6 +2,7 @@ module Fake.DotNet.NuGetTests open Fake.Core open Fake.DotNet.NuGet +open Fake.DotNet.NuGet.Version open Expecto [] @@ -36,5 +37,17 @@ let tests = let expected = "-ApiKey abc123 -DisableBuffering -NoSymbols -NoServiceEndpoint -Source MyNuGetSource -SymbolApiKey MySymbolApiKey -SymbolSource MySymbolSource -Timeout 360" Expect.equal cli expected "Push args generated correctly." + + test "Incrementing Patch for a SemVerInfo" { + Expect.equal (SemVer.parse("1.1.0") |> IncPatch |> string) "1.1.1" "Incremented Patch from 1.1.0 should be 1.1.1" + } + + test "Incrementing Minor for a SemVerInfo" { + Expect.equal (SemVer.parse("1.1.1") |> IncMinor |> string) "1.2.0" "Incremented Minor from 1.1.1 should be 1.2.0" + } + + test "Incrementing Major for a SemVerInfo" { + Expect.equal (SemVer.parse("1.1.1") |> IncMajor |> string) "2.0.0" "Incremented Patch from 1.1.1 should be 2.0.0" + } ]