Skip to content

Commit a23eb8d

Browse files
authored
Merge pull request 447 to Build on newer agents
1 parent 1439223 commit a23eb8d

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os:
26-
- ubuntu-22.04
27-
- macos-14
28-
- windows-2022
26+
- ubuntu-24.04
27+
- macOS-15
28+
- windows-2025
2929

3030
steps:
3131
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6

Expand-Template.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function Replace-Placeholders {
5252
$sn = Get-Command sn -ErrorAction SilentlyContinue
5353
if (-not $sn) {
5454
if ($IsMacOS -or $IsLinux) {
55-
Write-Error "sn command not found on PATH. Install mono and/or vote up this issue: https://github.com/dotnet/sdk/issues/13560"
55+
Write-Error 'sn command not found on PATH. Install mono, use "sudo apt-get install strong-name-tool" and/or vote up this issue: https://github.com/dotnet/sdk/issues/13560'
5656
exit(1)
5757
}
5858
$snExes = Get-ChildItem -Recurse "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\sn.exe"

azure-pipelines/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
- name: windowsPool
33
type: object
44
default:
5-
vmImage: windows-2022
5+
vmImage: windows-2025
66
- name: includeMacOS
77
type: boolean
88
- name: RunTests
@@ -28,7 +28,7 @@ jobs:
2828

2929
- job: Linux
3030
pool:
31-
vmImage: Ubuntu-22.04
31+
vmImage: ubuntu-24.04
3232
steps:
3333
- checkout: self
3434
fetchDepth: 0 # avoid shallow clone so nbgv can do its work.
@@ -46,7 +46,7 @@ jobs:
4646
- job: macOS
4747
condition: ${{ parameters.includeMacOS }}
4848
pool:
49-
vmImage: macOS-14
49+
vmImage: macOS-15
5050
steps:
5151
- checkout: self
5252
fetchDepth: 0 # avoid shallow clone so nbgv can do its work.

azure-pipelines/expand-template.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ steps:
66
- powershell: |
77
git config user.name "test user"
88
git config user.email "[email protected]"
9+
if ($IsLinux) {
10+
Write-Host "##[group]strong-name-tool installation"
11+
Write-Host "##[command]sudo apt-get install strong-name-tool"
12+
sudo apt-get install strong-name-tool 2>&1
13+
Write-Host "##[endgroup]"
14+
}
15+
if ($IsMacOS) {
16+
Write-Host "##[group]mono installation"
17+
Write-Host "##[command]brew install mono"
18+
brew install mono 2>&1
19+
Write-Host "##[endgroup]"
20+
}
921
./Expand-Template.ps1 -LibraryName Calc -Author "Andrew Arnott"
1022
displayName: 🧪 Expanding template
1123
failOnStderr: true

0 commit comments

Comments
 (0)