Skip to content

Commit 64e0afb

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/5.0.0'
2 parents f7dea01 + 2f43af4 commit 64e0afb

File tree

143 files changed

+757
-787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+757
-787
lines changed

‎.appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ install:
2020
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
2121
# .NET 5 required for Codecov.Tool
2222
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
23-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.427 -InstallDir $env:DOTNET_INSTALL_DIR'
24-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.409 -InstallDir $env:DOTNET_INSTALL_DIR'
25-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.403 -InstallDir $env:DOTNET_INSTALL_DIR'
23+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
24+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
2625
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
2726
- ps: dotnet --info
2827

‎.azuredevops/pipelines/templates/stages/integration-tests-git-repository.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stages:
2626
pool:
2727
vmImage: $(imageName)
2828
steps:
29-
- template: ../steps/install-net6.yml
29+
- template: ../steps/install-net8.yml
3030
- template: ../steps/provide-nuget-packages.yml
3131
- powershell: ./build.ps1 --verbosity=diagnostic
3232
workingDirectory: ./tests/Cake.Issues.GitRepository/script-runner

‎.azuredevops/pipelines/templates/stages/integration-tests-markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stages:
2626
pool:
2727
vmImage: $(imageName)
2828
steps:
29-
- template: ../steps/install-net6.yml
29+
- template: ../steps/install-net8.yml
3030
- template: ../steps/install-markdownlint.yml
3131
- template: ../steps/provide-nuget-packages.yml
3232
- powershell: ./build.ps1 --verbosity=diagnostic

‎.azuredevops/pipelines/templates/stages/integration-tests-msbuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ stages:
2626
pool:
2727
vmImage: $(imageName)
2828
steps:
29-
- template: ../steps/install-net6.yml
29+
- template: ../steps/install-net8.yml
3030
- template: ../steps/provide-nuget-packages.yml
3131
- powershell: ./build.ps1 --verbosity=diagnostic
32-
workingDirectory: ./tests/Cake.Issues.MsBuild/script-runner
32+
workingDirectory: ./tests/Cake.Issues.MsBuild/script-runner/net8.0
3333
displayName: 'Run integration tests'

‎.azuredevops/pipelines/templates/stages/integration-tests-reporting-console.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ stages:
2626
pool:
2727
vmImage: $(imageName)
2828
steps:
29-
- template: ../steps/install-net6.yml
29+
- template: ../steps/install-net8.yml
3030
- template: ../steps/provide-nuget-packages.yml
3131
- powershell: ./build.ps1 --verbosity=diagnostic
3232
workingDirectory: ./tests/Cake.Issues.Reporting.Console/script-runner
3333
displayName: 'Run integration tests'
34-
- job: TestReportingConsoleFrostingNet6Job
35-
displayName: Test Cake Frosting .NET 6
34+
- job: TestReportingConsoleFrostingNet8Job
35+
displayName: Test Cake Frosting .NET 8
3636
strategy:
3737
matrix:
3838
Windows_Server_2019:
@@ -52,8 +52,8 @@ stages:
5252
pool:
5353
vmImage: $(imageName)
5454
steps:
55-
- template: ../steps/install-net6.yml
55+
- template: ../steps/install-net8.yml
5656
- template: ../steps/provide-nuget-packages.yml
5757
- powershell: ./build.ps1 --verbosity=diagnostic
58-
workingDirectory: ./tests/Cake.Issues.Reporting.Console/frosting/net6.0
58+
workingDirectory: ./tests/Cake.Issues.Reporting.Console/frosting/net8.0
5959
displayName: 'Run integration tests'

‎.azuredevops/pipelines/templates/stages/integration-tests-reporting-generic.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ stages:
2626
pool:
2727
vmImage: $(imageName)
2828
steps:
29-
- template: ../steps/install-net6.yml
29+
- template: ../steps/install-net8.yml
3030
- template: ../steps/provide-nuget-packages.yml
3131
- powershell: ./build.ps1 --verbosity=diagnostic
3232
workingDirectory: ./tests/Cake.Issues.Reporting.Generic/script-runner
3333
displayName: 'Run integration tests'
3434
- publish: $(Build.SourcesDirectory)/docs/input/docs/report-formats/generic/templates
3535
artifact: Integration Tests Cake.Issues.Reporting.Generic Cake Scripting $(System.JobName)
3636
displayName: 'Publish generated reports as build artifact'
37-
- job: TestReportingGenericFrostingNet6Job
38-
displayName: Test Cake Frosting .NET 6
37+
- job: TestReportingGenericFrostingNet8Job
38+
displayName: Test Cake Frosting .NET 8
3939
strategy:
4040
matrix:
4141
Windows_Server_2019:
@@ -55,11 +55,11 @@ stages:
5555
pool:
5656
vmImage: $(imageName)
5757
steps:
58-
- template: ../steps/install-net6.yml
58+
- template: ../steps/install-net8.yml
5959
- template: ../steps/provide-nuget-packages.yml
6060
- powershell: ./build.ps1 --verbosity=diagnostic
6161
workingDirectory: ./tests/Cake.Issues.Reporting.Generic/frosting
6262
displayName: 'Run integration tests'
6363
- publish: $(Build.SourcesDirectory)/docs/input/docs/report-formats/generic/templates
64-
artifact: Integration Tests Cake.Issues.Reporting.Generic Cake Frosting .NET 6 $(System.JobName)
64+
artifact: Integration Tests Cake.Issues.Reporting.Generic Cake Frosting .NET 8 $(System.JobName)
6565
displayName: 'Publish generated reports as build artifact'

‎.azuredevops/pipelines/templates/stages/integration-tests-reporting-sarif.yml

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,45 +26,16 @@ stages:
2626
pool:
2727
vmImage: $(imageName)
2828
steps:
29-
- template: ../steps/install-net6.yml
29+
- template: ../steps/install-net8.yml
3030
- template: ../steps/provide-nuget-packages.yml
3131
- powershell: ./build.ps1 --verbosity=diagnostic
3232
workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/script-runner
3333
displayName: 'Run integration tests'
3434
- publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/script-runner/output
3535
artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Scripting $(System.JobName)
3636
displayName: 'Publish generated reports as build artifact'
37-
- job: TestReportingSarifFrostingNet6Job
38-
displayName: Test Cake Frosting .NET 6
39-
strategy:
40-
matrix:
41-
Windows_Server_2019:
42-
imageName: 'windows-2019'
43-
Windows_Server_2022:
44-
imageName: 'windows-2022'
45-
macOS_13:
46-
imageName: 'macOS-13'
47-
macOS_14:
48-
imageName: 'macOS-14'
49-
Ubuntu_20_04:
50-
imageName: 'ubuntu-20.04'
51-
Ubuntu_22_04:
52-
imageName: 'ubuntu-22.04'
53-
Ubuntu_24_04:
54-
imageName: 'ubuntu-24.04'
55-
pool:
56-
vmImage: $(imageName)
57-
steps:
58-
- template: ../steps/install-net6.yml
59-
- template: ../steps/provide-nuget-packages.yml
60-
- powershell: ./build.ps1 --verbosity=diagnostic
61-
workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net6
62-
displayName: 'Run integration tests'
63-
- publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/frosting/output
64-
artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 6 $(System.JobName)
65-
displayName: 'Publish generated reports as build artifact'
66-
- job: TestReportingSarifFrostingNet7Job
67-
displayName: Test Cake Frosting .NET 7
37+
- job: TestReportingSarifFrostingNet8Job
38+
displayName: Test Cake Frosting .NET 8
6839
strategy:
6940
matrix:
7041
Windows_Server_2019:
@@ -84,16 +55,16 @@ stages:
8455
pool:
8556
vmImage: $(imageName)
8657
steps:
87-
- template: ../steps/install-net7.yml
58+
- template: ../steps/install-net8.yml
8859
- template: ../steps/provide-nuget-packages.yml
8960
- powershell: ./build.ps1 --verbosity=diagnostic
90-
workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net7
61+
workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net8
9162
displayName: 'Run integration tests'
9263
- publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/frosting/output
93-
artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 7 $(System.JobName)
64+
artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 8 $(System.JobName)
9465
displayName: 'Publish generated reports as build artifact'
95-
- job: TestReportingSarifFrostingNet8Job
96-
displayName: Test Cake Frosting .NET 8
66+
- job: TestReportingSarifFrostingNet9Job
67+
displayName: Test Cake Frosting .NET 9
9768
strategy:
9869
matrix:
9970
Windows_Server_2019:
@@ -113,11 +84,11 @@ stages:
11384
pool:
11485
vmImage: $(imageName)
11586
steps:
116-
- template: ../steps/install-net8.yml
87+
- template: ../steps/install-net9.yml
11788
- template: ../steps/provide-nuget-packages.yml
11889
- powershell: ./build.ps1 --verbosity=diagnostic
119-
workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net8
90+
workingDirectory: ./tests/Cake.Issues.Reporting.Sarif/frosting/net9
12091
displayName: 'Run integration tests'
12192
- publish: $(Build.SourcesDirectory)/tests/Cake.Issues.Reporting.Sarif/frosting/output
122-
artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 8 $(System.JobName)
93+
artifact: Integration Tests Cake.Issues.Reporting.Sarif Cake Frosting .NET 9 $(System.JobName)
12394
displayName: 'Publish generated reports as build artifact'

‎.azuredevops/pipelines/templates/steps/install-net7.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.azuredevops/pipelines/templates/steps/install-net6.yml renamed to ‎.azuredevops/pipelines/templates/steps/install-net9.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
steps:
44
- task: UseDotNet@2
55
inputs:
6-
version: '6.x'
7-
displayName: 'Install .NET 6'
6+
version: '9.x'
7+
displayName: 'Install .NET 9'

‎.azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
steps:
44
# .NET 5 required for Codecov.Tool
55
- template: install-net5.yml
6-
- template: install-net6.yml
7-
- template: install-net7.yml
86
- template: install-net8.yml
7+
- template: install-net9.yml

‎.github/renovate.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
"github>cake-contrib/renovate-presets:cake-issues"
55
],
66
"packageRules": [
7+
{
8+
"description": "Ignore Cake runner minor and patch updates",
9+
"matchDepNames": [
10+
"Cake.Tool",
11+
"Cake.Frosting"
12+
],
13+
"matchUpdateTypes": ["minor", "patch"],
14+
"enabled": false
15+
},
716
{
817
"description": "Do not update Microsoft.Build.* packages in Cake.Issues.MsBuild since required version depends on the version used in MSBuild.StructuredLogger",
918
"matchFileNames": ["src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj", "src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj"],

‎.github/workflows/integrationtests.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ jobs:
2525
# .NET 5 required for GitVersion
2626
dotnet-version: |
2727
5.x
28-
6.x
29-
7.x
3028
8.x
29+
9.x
3130
- name: Build
3231
run: ./build.sh --target=Create-NuGet-Packages
3332
shell: bash
@@ -47,7 +46,7 @@ jobs:
4746
windows-2019, windows-2022,
4847
ubuntu-20.04, ubuntu-22.04, ubuntu-24.04,
4948
macos-13, macos-14]
50-
dotnet: [6.x, 7.x, 8.x]
49+
dotnet: [8.x, 9.x]
5150
runs-on: ${{ matrix.os }}
5251
steps:
5352
- name: Get the sources
@@ -56,9 +55,15 @@ jobs:
5655
uses: ./.github/actions/prepare-integration-test
5756
with:
5857
dotnet-version: ${{ matrix.dotnet }}
58+
- name: Determine TFM
59+
run: |
60+
DOTNET_VERSION="${{ matrix.dotnet }}"
61+
DOTNET_MAJOR_VERSION="${DOTNET_VERSION%%.*}"
62+
echo "TFM=net${DOTNET_MAJOR_VERSION}.0" >> $GITHUB_ENV
63+
shell: bash
5964
- name: Run integration tests
6065
run: ./build.sh --verbosity=diagnostic
61-
working-directory: ./tests/Cake.Issues.MsBuild/script-runner/
66+
working-directory: ./tests/Cake.Issues.MsBuild/script-runner/${{ env.TFM }}
6267
shell: bash
6368
# Integration Tests Cake.Issues.PullRequests.GitHubActions Cake Scripting
6469
IntegrationTestsPullRequestsGitHubActionsCakeScripting:
@@ -71,7 +76,7 @@ jobs:
7176
windows-2019, windows-2022,
7277
ubuntu-20.04, ubuntu-22.04, ubuntu-24.04,
7378
macos-13, macos-14]
74-
dotnet: [6.x, 7.x, 8.x]
79+
dotnet: [8.x, 9.x]
7580
runs-on: ${{ matrix.os }}
7681
steps:
7782
- name: Get the sources

‎.github/workflows/unittests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ jobs:
3232
# .NET 5 required for GitVersion
3333
dotnet-version: |
3434
5.x
35-
6.x
36-
7.x
3735
8.x
36+
9.x
3837
# Ubuntu 24.04 does not have Mono installed, which is Required for Cake.Recipe
3938
- name: Install Mono
4039
if: ${{ matrix.os == 'ubuntu-24.04' }}

0 commit comments

Comments
 (0)