From c29323bcefc2bd5ff1521b54866fa3dacc27e745 Mon Sep 17 00:00:00 2001
From: AdmiringWorm <kim.nordmo@gmail.com>
Date: Sat, 20 Feb 2021 17:46:25 +0100
Subject: [PATCH] (GH-775) Add ability to skip duplicate package version during
 push

This allows duplicate NuGet packages to not throw
any errors when there is a duplicate package version
in the upstream repository, and instead allow the
build to continue without any failures
---
 Cake.Recipe/Content/packages.cake                 | 3 ++-
 Cake.Recipe/Content/toolsettings.cake             | 4 +++-
 config.wyam.packages.xml                          | 2 +-
 docs/input/docs/fundamentals/set-tool-settings.md | 8 ++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cake.Recipe/Content/packages.cake b/Cake.Recipe/Content/packages.cake
index 2220305c..ca31a641 100644
--- a/Cake.Recipe/Content/packages.cake
+++ b/Cake.Recipe/Content/packages.cake
@@ -261,7 +261,8 @@ public void PushNuGetPackages(ICakeContext context, bool isRelease, List<Package
 
             var nugetPushSettings = new NuGetPushSettings
                 {
-                    Source = nugetSource.PushUrl
+                    Source = nugetSource.PushUrl,
+                    SkipDuplicate = ToolSettings.SkipDuplicatePackages
                 };
 
             var canPushToNuGetSource = false;
diff --git a/Cake.Recipe/Content/toolsettings.cake b/Cake.Recipe/Content/toolsettings.cake
index 8aba2eec..3a0a63f0 100644
--- a/Cake.Recipe/Content/toolsettings.cake
+++ b/Cake.Recipe/Content/toolsettings.cake
@@ -16,6 +16,7 @@ public static class ToolSettings
     public static MSBuildToolVersion BuildMSBuildToolVersion { get; private set; }
     public static int MaxCpuCount { get; private set; }
     public static string TargetFrameworkPathOverride { get; private set; }
+    public static bool SkipDuplicatePackages { get; private set; }
 
     public static string CodecovTool { get; private set; }
     public static string CoverallsTool { get; private set; }
@@ -99,7 +100,8 @@ public static class ToolSettings
         DirectoryPath targetFrameworkPathOverride = null,
         string[] dupFinderExcludeFilesByStartingCommentSubstring = null,
         int? dupFinderDiscardCost = null,
-        bool? dupFinderThrowExceptionOnFindingDuplicates = null
+        bool? dupFinderThrowExceptionOnFindingDuplicates = null,
+        bool skipDuplicatePackages = false
     )
     {
         context.Information("Setting up tools...");
diff --git a/config.wyam.packages.xml b/config.wyam.packages.xml
index 4d1932d8..001a4510 100644
--- a/config.wyam.packages.xml
+++ b/config.wyam.packages.xml
@@ -203,7 +203,7 @@
     <package id="Wyam.Razor" version="2.2.9" targetFramework="netcoreapp2.1" />
     <package id="Wyam.Sass" version="2.2.9" targetFramework="netcoreapp2.1" />
     <package id="Wyam.SearchIndex" version="2.2.9" targetFramework="netcoreapp2.1" />
-    <package id="YamlDotNet" version="4.3.1" targetFramework="netcoreapp2.1" />
+    <package id="YamlDotNet" version="5.1.0" targetFramework="netcoreapp2.1" />
     <package id="Wyam.Yaml" version="2.2.9" targetFramework="netcoreapp2.1" />
     <package id="Wyam.Web" version="2.2.9" targetFramework="netcoreapp2.1" />
   </package>
diff --git a/docs/input/docs/fundamentals/set-tool-settings.md b/docs/input/docs/fundamentals/set-tool-settings.md
index 11b9bdcb..9e2cf835 100644
--- a/docs/input/docs/fundamentals/set-tool-settings.md
+++ b/docs/input/docs/fundamentals/set-tool-settings.md
@@ -161,3 +161,11 @@ This is used when executing the DupFinder command line tool.  If set to true, an
 Type: `bool?`
 
 Default Value: `null`
+
+### skipDuplicatesPackages
+
+This is used to tell NuGet to ignore issues with trying to push package versions when the version already exist upstream, instead of failing the build.
+
+Type: `bool`
+
+Default Value: `false`