Merge branch 'bugfix'

# Conflicts:
#	RELEASE_NOTES.md
#	src/LockFileComparer/AssemblyInfo.fs
#	src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
#	src/Paket.Core/AssemblyInfo.fs
#	src/Paket/AssemblyInfo.fs

Author: forki

RELEASE_NOTES.md

@@ -1,6 +1,9 @@
-#### 6.0.0-alpha005 - 2019-12-05
+#### 6.0.0-alpha006 - 2019-12-05
 * Full .NET Core / SDK compatible version
 
+#### 5.241.1 - 2019-12-05
+* Added IgnoreConflict option for paket push - https://github.com/fsprojects/Paket/pull/3741
+
 #### 5.240.1 - 2019-12-05
 * SECURITY: Check against zip leak in the workaround case of 5.240.0 - https://github.com/fsprojects/Paket/pull/3747
 

src/Paket.Core/Dependencies/RemoteUpload.fs

@@ -29,8 +29,7 @@ let GetUrlWithEndpoint (url: string option) (endPoint: string option) =
         | Some whyIsThisNeeded   , _                   -> failwith "Url and endpoint combination not supported"
     urlWithEndpoint.ToString ()
 
-
-let Push maxTrials url apiKey clientVersion packageFileName =
+let Push maxTrials url apiKey clientVersion packageFileName ignoreConflicts =
     let tracefnVerbose m = Printf.kprintf traceVerbose m
 #if USE_WEB_CLIENT_FOR_UPLOAD
     let useHttpClient = Environment.GetEnvironmentVariable "PAKET_PUSH_HTTPCLIENT" = "true"
@@ -72,6 +71,10 @@ let Push maxTrials url apiKey clientVersion packageFileName =
 #endif
             tracefn "Pushing %s complete." packageFileName
         with
+        | :? RequestFailedException as rfe when rfe.Info.IsSome && rfe.Info.Value.StatusCode = HttpStatusCode.Conflict && ignoreConflicts ->
+            tracefn "Package %s already exists. - Conflict (409) status ignored!" packageFileName
+        | exn when exn.Message.Contains("(409)") && ignoreConflicts ->
+            tracefn "Package %s already exists. - Conflict (409) status ignored!" packageFileName
         | :? RequestFailedException as rfe when rfe.Info.IsSome && rfe.Info.Value.StatusCode = HttpStatusCode.Conflict ->
             rethrowf Exception rfe "Package %s already exists" packageFileName
         | exn when exn.Message.Contains("(409)") ->

src/Paket.Core/PublicAPI.fs

@@ -753,7 +753,7 @@ type Dependencies(dependenciesFileName: string) =
         PackageProcess.Pack(workingDir, dependenciesFile, outputPath, buildConfig, buildPlatform, version, specificVersions, releaseNotes, templateFile, excludedTemplates, lockDependencies, minimumFromLockFile, pinProjectReferences, interprojectReferencesConstraint, symbols, includeReferencedProjects, projectUrl)
 
     /// Pushes a nupkg file.
-    static member Push(packageFileName, ?url, ?apiKey, (?endPoint: string), ?paketVersion, ?maxTrials) =
+    static member Push(packageFileName, ?url, ?apiKey, (?endPoint: string), ?paketVersion, ?maxTrials, ?ignoreConflicts) =
         let urlWithEndpoint = RemoteUpload.GetUrlWithEndpoint url endPoint
         let envKey =
             match Environment.GetEnvironmentVariable("NUGET_KEY") |> Option.ofObj with
@@ -783,12 +783,14 @@ type Dependencies(dependenciesFileName: string) =
             failwithf "Could not push package %s due to missing credentials for the url %s. Please specify a NuGet API key via the command line, the environment variable \"nugetkey\", or by using 'paket config add-token'." packageFileName urlWithEndpoint
         | Some apiKey ->
             let maxTrials = defaultArg maxTrials 5
+            let ignoreConflicts = defaultArg ignoreConflicts false
             RemoteUpload.Push
                 maxTrials
                 urlWithEndpoint
                 apiKey
                 "4.1.0"  // see https://github.com/NuGet/NuGetGallery/issues/4315 - maybe us (defaultArg paketVersion "4.1.0")
                 packageFileName
+                ignoreConflicts
 
     /// Lists all paket.template files in the current solution.
     member this.ListTemplateFiles() : TemplateFile list =

src/Paket/Commands.fs

@@ -592,6 +592,8 @@ type PushArgs =
 
     | [<Unique>] Endpoint of path:string
     | [<Hidden;Unique;CustomCommandLine("endpoint")>] Endpoint_Legacy of path:string
+
+    | [<Unique;CustomCommandLine("--ignoreConflicts")>] Ignore_Conflicts
 with
     interface IArgParserTemplate with
         member this.Usage =
@@ -608,6 +610,8 @@ with
             | Endpoint(_) -> "API endpoint to push to (default: /api/v2/package)"
             | Endpoint_Legacy(_) -> "[obsolete]"
 
+            | Ignore_Conflicts -> "Ignore any HTTP409 (Conflict) errors and treat as success"
+
 type GenerateLoadScriptsArgs =
     | [<AltCommandLine("-g")>] Group of name:string
     | [<Hidden;CustomCommandLine("groups")>] Group_Legacy of name:string list

src/Paket/Program.fs

@@ -739,11 +739,13 @@ let push paketVersion (results : ParseResults<_>) =
         (results.TryGetResult <@ PushArgs.Api_Key @>,
          results.TryGetResult <@ PushArgs.Api_Key_Legacy @>)
         |> legacyOption results (ReplaceArgument("--api-key", "apikey"))
+    let ignoreConflicts = results.Contains <@ PushArgs.Ignore_Conflicts @>
 
     Dependencies.Push(fileName,
                       ?url = url,
                       ?endPoint = endpoint,
-                      ?apiKey = apiKey)
+                      ?apiKey = apiKey,
+                      ignoreConflicts = ignoreConflicts)
 
 let generateLoadScripts (results : ParseResults<GenerateLoadScriptsArgs>) =
     let providedFrameworks =