Merge branch 'release/5.0.0'

cake-contrib · Dec 2, 2024 · 64e0afb · 64e0afb
2 parents f7dea01 + 2f43af4
commit 64e0afb
Show file tree

Hide file tree

Showing 143 changed files with 757 additions and 787 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -20,9 +20,8 @@ install:
   - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
   # .NET 5 required for Codecov.Tool
   - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.427 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.409 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.403 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
   - ps: dotnet --info
 

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-git-repository.yml b/.azuredevops/pipelines/templates/stages/integration-tests-git-repository.yml
@@ -26,7 +26,7 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
         workingDirectory: ./tests/Cake.Issues.GitRepository/script-runner

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-markdownlint.yml b/.azuredevops/pipelines/templates/stages/integration-tests-markdownlint.yml
@@ -26,7 +26,7 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/install-markdownlint.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-msbuild.yml b/.azuredevops/pipelines/templates/stages/integration-tests-msbuild.yml
@@ -26,8 +26,8 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
-        workingDirectory: ./tests/Cake.Issues.MsBuild/script-runner
+        workingDirectory: ./tests/Cake.Issues.MsBuild/script-runner/net8.0
         displayName: 'Run integration tests'
diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-reporting-console.yml b/.azuredevops/pipelines/templates/stages/integration-tests-reporting-console.yml
@@ -26,13 +26,13 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
         workingDirectory: ./tests/Cake.Issues.Reporting.Console/script-runner
         displayName: 'Run integration tests'
-    - job: TestReportingConsoleFrostingNet6Job
-      displayName: Test Cake Frosting .NET 6
+    - job: TestReportingConsoleFrostingNet8Job
+      displayName: Test Cake Frosting .NET 8
       strategy:
         matrix:
           Windows_Server_2019:
@@ -52,8 +52,8 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
-        workingDirectory: ./tests/Cake.Issues.Reporting.Console/frosting/net6.0
+        workingDirectory: ./tests/Cake.Issues.Reporting.Console/frosting/net8.0
         displayName: 'Run integration tests'
diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-reporting-generic.yml b/.azuredevops/pipelines/templates/stages/integration-tests-reporting-generic.yml
@@ -26,16 +26,16 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
         workingDirectory: ./tests/Cake.Issues.Reporting.Generic/script-runner
         displayName: 'Run integration tests'
       - publish: $(Build.SourcesDirectory)/docs/input/docs/report-formats/generic/templates
         artifact: Integration Tests Cake.Issues.Reporting.Generic Cake Scripting $(System.JobName)
         displayName: 'Publish generated reports as build artifact'
-    - job: TestReportingGenericFrostingNet6Job
-      displayName: Test Cake Frosting .NET 6
+    - job: TestReportingGenericFrostingNet8Job
+      displayName: Test Cake Frosting .NET 8
       strategy:
         matrix:
           Windows_Server_2019:
@@ -55,11 +55,11 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
         workingDirectory: ./tests/Cake.Issues.Reporting.Generic/frosting
         displayName: 'Run integration tests'
       - publish: $(Build.SourcesDirectory)/docs/input/docs/report-formats/generic/templates
-        artifact: Integration Tests Cake.Issues.Reporting.Generic Cake Frosting .NET 6 $(System.JobName)
+        artifact: Integration Tests Cake.Issues.Reporting.Generic Cake Frosting .NET 8 $(System.JobName)
         displayName: 'Publish generated reports as build artifact'
diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-reporting-sarif.yml b/.azuredevops/pipelines/templates/stages/integration-tests-reporting-sarif.yml
@@ -26,45 +26,16 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net6.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
         workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/script-runner
         displayName: 'Run integration tests'
       - publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/script-runner/output
         artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Scripting $(System.JobName)
         displayName: 'Publish generated reports as build artifact'
-    - job: TestReportingSarifFrostingNet6Job
-      displayName: Test Cake Frosting .NET 6
-      strategy:
-        matrix:
-          Windows_Server_2019:
-            imageName: 'windows-2019'
-          Windows_Server_2022:
-            imageName: 'windows-2022'
-          macOS_13:
-            imageName: 'macOS-13'
-          macOS_14:
-            imageName: 'macOS-14'
-          Ubuntu_20_04:
-            imageName: 'ubuntu-20.04'
-          Ubuntu_22_04:
-            imageName: 'ubuntu-22.04'
-          Ubuntu_24_04:
-            imageName: 'ubuntu-24.04'
-      pool:
-        vmImage: $(imageName)
-      steps:
-      - template: ../steps/install-net6.yml 
-      - template: ../steps/provide-nuget-packages.yml 
-      - powershell: ./build.ps1 --verbosity=diagnostic
-        workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net6
-        displayName: 'Run integration tests'
-      - publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/frosting/output
-        artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 6 $(System.JobName)
-        displayName: 'Publish generated reports as build artifact'
-    - job: TestReportingSarifFrostingNet7Job
-      displayName: Test Cake Frosting .NET 7
+    - job: TestReportingSarifFrostingNet8Job
+      displayName: Test Cake Frosting .NET 8
       strategy:
         matrix:
           Windows_Server_2019:
@@ -84,16 +55,16 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net7.yml 
+      - template: ../steps/install-net8.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
-        workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net7
+        workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net8
         displayName: 'Run integration tests'
       - publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/frosting/output
-        artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 7 $(System.JobName)
+        artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 8 $(System.JobName)
         displayName: 'Publish generated reports as build artifact'
-    - job: TestReportingSarifFrostingNet8Job
-      displayName: Test Cake Frosting .NET 8
+    - job: TestReportingSarifFrostingNet9Job
+      displayName: Test Cake Frosting .NET 9
       strategy:
         matrix:
           Windows_Server_2019:
@@ -113,11 +84,11 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - template: ../steps/install-net8.yml 
+      - template: ../steps/install-net9.yml 
       - template: ../steps/provide-nuget-packages.yml 
       - powershell: ./build.ps1 --verbosity=diagnostic
-        workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net8
+        workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net9
         displayName: 'Run integration tests'
       - publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/frosting/output
-        artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 8 $(System.JobName)
+        artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 9 $(System.JobName)
         displayName: 'Publish generated reports as build artifact'
diff --git a/.azuredevops/pipelines/templates/steps/install-net7.yml b/.azuredevops/pipelines/templates/steps/install-net7.yml
diff --git a/...ipelines/templates/steps/install-net6.yml → ...ipelines/templates/steps/install-net9.yml b/...ipelines/templates/steps/install-net6.yml → ...ipelines/templates/steps/install-net9.yml
@@ -3,5 +3,5 @@
 steps:
   - task: UseDotNet@2
     inputs:
-      version: '6.x'
-    displayName: 'Install .NET 6'
+      version: '9.x'
+    displayName: 'Install .NET 9'
diff --git a/.azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml b/.azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml
@@ -3,6 +3,5 @@
 steps:
   # .NET 5 required for Codecov.Tool
   - template: install-net5.yml
-  - template: install-net6.yml
-  - template: install-net7.yml
   - template: install-net8.yml
+  - template: install-net9.yml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -4,6 +4,15 @@
     "github>cake-contrib/renovate-presets:cake-issues"
   ],
   "packageRules": [
+    {
+      "description": "Ignore Cake runner minor and patch updates",
+      "matchDepNames": [
+          "Cake.Tool",
+          "Cake.Frosting"
+      ],
+      "matchUpdateTypes": ["minor", "patch"],
+      "enabled": false
+    },
     {
       "description": "Do not update Microsoft.Build.* packages in Cake.Issues.MsBuild since required version depends on the version used in MSBuild.StructuredLogger",
       "matchFileNames": ["src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj", "src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj"],

diff --git a/.github/workflows/integrationtests.yml b/.github/workflows/integrationtests.yml
@@ -25,9 +25,8 @@ jobs:
           # .NET 5 required for GitVersion
           dotnet-version: | 
             5.x
-            6.x
-            7.x
             8.x
+            9.x
       - name: Build
         run: ./build.sh --target=Create-NuGet-Packages
         shell: bash
@@ -47,7 +46,7 @@ jobs:
           windows-2019, windows-2022,
           ubuntu-20.04, ubuntu-22.04, ubuntu-24.04,
           macos-13, macos-14]
-        dotnet: [6.x, 7.x, 8.x]
+        dotnet: [8.x, 9.x]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Get the sources
@@ -56,9 +55,15 @@ jobs:
         uses: ./.github/actions/prepare-integration-test
         with:
           dotnet-version: ${{ matrix.dotnet }}
+      - name: Determine TFM
+        run: |
+          DOTNET_VERSION="${{ matrix.dotnet }}"
+          DOTNET_MAJOR_VERSION="${DOTNET_VERSION%%.*}"
+          echo "TFM=net${DOTNET_MAJOR_VERSION}.0" >> $GITHUB_ENV
+        shell: bash
       - name: Run integration tests
         run: ./build.sh --verbosity=diagnostic
-        working-directory: ./tests/Cake.Issues.MsBuild/script-runner/
+        working-directory: ./tests/Cake.Issues.MsBuild/script-runner/${{ env.TFM }}
         shell: bash
   # Integration Tests Cake.Issues.PullRequests.GitHubActions Cake Scripting
   IntegrationTestsPullRequestsGitHubActionsCakeScripting:
@@ -71,7 +76,7 @@ jobs:
           windows-2019, windows-2022,
           ubuntu-20.04, ubuntu-22.04, ubuntu-24.04,
           macos-13, macos-14]
-        dotnet: [6.x, 7.x, 8.x]
+        dotnet: [8.x, 9.x]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Get the sources

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -32,9 +32,8 @@ jobs:
           # .NET 5 required for GitVersion
           dotnet-version: | 
             5.x
-            6.x
-            7.x
             8.x
+            9.x
       # Ubuntu 24.04 does not have Mono installed, which is Required for Cake.Recipe
       - name: Install Mono
         if: ${{ matrix.os == 'ubuntu-24.04' }}