Merge pull request #101 from nils-a/feature/GH-100

(#100) Bump Cake.Recipe to 3.1.1
cake-contrib · Jul 18, 2024 · d6d65f5 · d6d65f5
2 parents cd3983b + 0c85439
commit d6d65f5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 12 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,23 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2019
+image: Visual Studio 2022
+
+#---------------------------------#
+#  Install .NET                   #
+#---------------------------------#
+install:
+  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+  - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+  - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 2.1 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 3.1 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 5.0 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 6.0 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 7.0 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 8.0 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+  - ps: dotnet --info
 
 #---------------------------------#
 #  Build Script                   #

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "1.3.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -22,10 +22,33 @@ steps:
   inputs:
     key: '"$(Agent.OS)" | recipe.cake'
     path: 'tools'
+- task: UseDotNet@2
+  displayName: 'Install .NETCore 2.1'
+  inputs:
+    version: '2.1.x'
+- task: UseDotNet@2
+  displayName: 'Install .NETCore 3.1'
+  inputs:
+    version: '3.1.x'
+- task: UseDotNet@2
+  displayName: 'Install .NET 5'
+  inputs:
+    version: '5.x'
+- task: UseDotNet@2
+  displayName: 'Install .NET 6'
+  inputs:
+    version: '6.x'
+- task: UseDotNet@2
+  displayName: 'Install .NET 7'
+  inputs:
+    version: '7.x'
+- task: UseDotNet@2
+  displayName: 'Install .NET 8'
+  inputs:
+    version: '8.x'
 - task: Cake@2
   inputs:
     script: 'recipe.cake'
     target: 'CI'
     verbosity: 'Normal'
-    Bootstrap: true
-    Version: '0.38.5'
+    Version: '1.3.0'
diff --git 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 }
diff --git 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 "$@"
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.0
+#load nuget:?package=Cake.Recipe&version=3.1.1
 
 Environment.SetVariableNames();