Skip to content

Commit f7dea01

Browse files
committed
Merge branch 'release/4.12.0'
2 parents 0a15339 + be6ca84 commit f7dea01

File tree

68 files changed

+121
-79
lines changed

Some content is hidden

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

68 files changed

+121
-79
lines changed

.appveyor.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ install:
1818
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
1919
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
2020
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
21-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.425 -InstallDir $env:DOTNET_INSTALL_DIR'
21+
# .NET 5 required for Codecov.Tool
22+
- 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'
2224
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.409 -InstallDir $env:DOTNET_INSTALL_DIR'
23-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.402 -InstallDir $env:DOTNET_INSTALL_DIR'
25+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.403 -InstallDir $env:DOTNET_INSTALL_DIR'
2426
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
2527
- ps: dotnet --info
2628

.azuredevops/pipelines/templates/stages/build-for-integration-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ stages:
88
- job: CreateNuGetPackagesJob
99
displayName: Create NuGet Packages
1010
pool:
11+
# Run on Ubuntu 22, since Ubuntu 24.04 does not have Mono installed, which is Required for Cake.Recipe and separate Mono installation requires more time.
1112
vmImage: 'ubuntu-22.04'
1213
steps:
1314
- template: ../steps/install-required-dotnet-versions-for-building.yml

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ stages:
2121
imageName: 'ubuntu-20.04'
2222
Ubuntu_22_04:
2323
imageName: 'ubuntu-22.04'
24+
Ubuntu_24_04:
25+
imageName: 'ubuntu-24.04'
2426
pool:
2527
vmImage: $(imageName)
2628
steps:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ stages:
2121
imageName: 'ubuntu-20.04'
2222
Ubuntu_22_04:
2323
imageName: 'ubuntu-22.04'
24+
Ubuntu_24_04:
25+
imageName: 'ubuntu-24.04'
2426
pool:
2527
vmImage: $(imageName)
2628
steps:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ stages:
2121
imageName: 'ubuntu-20.04'
2222
Ubuntu_22_04:
2323
imageName: 'ubuntu-22.04'
24+
Ubuntu_24_04:
25+
imageName: 'ubuntu-24.04'
2426
pool:
2527
vmImage: $(imageName)
2628
steps:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ stages:
2121
imageName: 'ubuntu-20.04'
2222
Ubuntu_22_04:
2323
imageName: 'ubuntu-22.04'
24+
Ubuntu_24_04:
25+
imageName: 'ubuntu-24.04'
2426
pool:
2527
vmImage: $(imageName)
2628
steps:
@@ -45,6 +47,8 @@ stages:
4547
imageName: 'ubuntu-20.04'
4648
Ubuntu_22_04:
4749
imageName: 'ubuntu-22.04'
50+
Ubuntu_24_04:
51+
imageName: 'ubuntu-24.04'
4852
pool:
4953
vmImage: $(imageName)
5054
steps:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ stages:
2121
imageName: 'ubuntu-20.04'
2222
Ubuntu_22_04:
2323
imageName: 'ubuntu-22.04'
24+
Ubuntu_24_04:
25+
imageName: 'ubuntu-24.04'
2426
pool:
2527
vmImage: $(imageName)
2628
steps:
@@ -48,6 +50,8 @@ stages:
4850
imageName: 'ubuntu-20.04'
4951
Ubuntu_22_04:
5052
imageName: 'ubuntu-22.04'
53+
Ubuntu_24_04:
54+
imageName: 'ubuntu-24.04'
5155
pool:
5256
vmImage: $(imageName)
5357
steps:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ stages:
2121
imageName: 'ubuntu-20.04'
2222
Ubuntu_22_04:
2323
imageName: 'ubuntu-22.04'
24+
Ubuntu_24_04:
25+
imageName: 'ubuntu-24.04'
2426
pool:
2527
vmImage: $(imageName)
2628
steps:
@@ -48,6 +50,8 @@ stages:
4850
imageName: 'ubuntu-20.04'
4951
Ubuntu_22_04:
5052
imageName: 'ubuntu-22.04'
53+
Ubuntu_24_04:
54+
imageName: 'ubuntu-24.04'
5155
pool:
5256
vmImage: $(imageName)
5357
steps:
@@ -75,6 +79,8 @@ stages:
7579
imageName: 'ubuntu-20.04'
7680
Ubuntu_22_04:
7781
imageName: 'ubuntu-22.04'
82+
Ubuntu_24_04:
83+
imageName: 'ubuntu-24.04'
7884
pool:
7985
vmImage: $(imageName)
8086
steps:
@@ -102,6 +108,8 @@ stages:
102108
imageName: 'ubuntu-20.04'
103109
Ubuntu_22_04:
104110
imageName: 'ubuntu-22.04'
111+
Ubuntu_24_04:
112+
imageName: 'ubuntu-24.04'
105113
pool:
106114
vmImage: $(imageName)
107115
steps:

.azuredevops/pipelines/templates/stages/unit-tests.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@ stages:
1212
Windows:
1313
imageName: 'windows-2022'
1414
Ubuntu:
15-
imageName: 'ubuntu-22.04'
15+
imageName: 'ubuntu-24.04'
1616
macOS:
1717
imageName: 'macOS-13'
1818
pool:
1919
vmImage: $(imageName)
2020
steps:
2121
- template: ../steps/install-required-dotnet-versions-for-building.yml
22+
# Ubuntu 24.04 does not have Mono installed, which is Required for Cake.Recipe
23+
- bash: sudo apt-get install mono-complete
24+
condition: eq(variables['imageName'], 'ubuntu-24.04')
25+
displayName: 'Install Mono'
2226
- bash: ./build.sh --target=Test
2327
displayName: 'Run Unit Tests'
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Installs .NET 6
2+
3+
steps:
4+
- task: UseDotNet@2
5+
inputs:
6+
version: '5.x'
7+
displayName: 'Install .NET 5'

0 commit comments

Comments
 (0)