From 7617c0ed79188ea1fbe00c0d66c7c5eee5e30dfc Mon Sep 17 00:00:00 2001
From: Gary Ewan Park <gep13@gep13.co.uk>
Date: Wed, 7 Aug 2024 03:10:36 -0700
Subject: [PATCH] (build) Switch to using Cake.Recipe 3.1.1

Also took the opportunity to remove the bootstrapping of modules in the
build scripts, as this is no longer required.
---
 .config/dotnet-tools.json | 5 +++--
 build.ps1                 | 4 ----
 build.sh                  | 3 ---
 recipe.cake               | 5 +----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 727dfd7..dd9d785 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "1.3.0",
       "commands": [
         "dotnet-cake"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index 0940a31..ea6b645 100644
--- a/build.ps1
+++ b/build.ps1
@@ -6,10 +6,6 @@ Write-Host "Restoring .NET Core tools"
 dotnet tool restore
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-Write-Host "Bootstrapping Cake"
-dotnet cake $SCRIPT_NAME --bootstrap
-if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
 Write-Host "Running Build"
 dotnet cake $SCRIPT_NAME @args
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
\ No newline at end of file
diff --git a/build.sh b/build.sh
index ba5d0c9..9ed86f0 100755
--- a/build.sh
+++ b/build.sh
@@ -4,8 +4,5 @@ SCRIPT_NAME="recipe.cake"
 echo "Restoring .NET Core tools"
 dotnet tool restore
 
-echo "Bootstrapping Cake"
-dotnet cake $SCRIPT_NAME --bootstrap
-
 echo "Running Build"
 dotnet cake $SCRIPT_NAME "$@"
\ No newline at end of file
diff --git a/recipe.cake b/recipe.cake
index df094ce..8d777c3 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.1
+#load nuget:?package=Cake.Recipe&version=3.1.1
 
 Environment.SetVariableNames();
 
@@ -10,7 +10,6 @@ BuildParameters.SetParameters(context: Context,
                             repositoryName: "Cake.AppVeyor",
                             appVeyorAccountName: "cakecontrib",
                             shouldRunDotNetCorePack: true,
-                            shouldRunDupFinder: false,
                             shouldRunInspectCode: false,
                             testFilePattern: "DO_NOT_RUN_TESTS",
                             preferredBuildProviderType: BuildProviderType.GitHubActions);
@@ -18,8 +17,6 @@ BuildParameters.SetParameters(context: Context,
 BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(context: Context,
-                            dupFinderExcludePattern: new string[] {
-                                BuildParameters.RootDirectoryPath + "/Cake.AppVeyor.Tests/*.cs" },
                             testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[FakeItEasy]*",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");