Skip to content

Commit 1c972c1

Browse files
committed
Merge remote-tracking branch 'origin/main' into microbuild
2 parents 923e36d + a23eb8d commit 1c972c1

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

Expand-Template.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function Replace-Placeholders {
4848
$sn = Get-Command sn -ErrorAction SilentlyContinue
4949
if (-not $sn) {
5050
if ($IsMacOS -or $IsLinux) {
51-
Write-Error "sn command not found on PATH. Install mono and/or vote up this issue: https://github.com/dotnet/sdk/issues/13560"
51+
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'
5252
exit(1)
5353
}
5454
$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
@@ -104,15 +104,15 @@ parameters:
104104
- name: windowsPool
105105
type: object
106106
default:
107-
vmImage: windows-2022
107+
vmImage: windows-2025
108108
- name: linuxPool
109109
type: object
110110
default:
111-
vmImage: ubuntu-22.04
111+
vmImage: ubuntu-24.04
112112
- name: macOSPool
113113
type: object
114114
default:
115-
vmImage: macOS-14
115+
vmImage: macOS-15
116116

117117
jobs:
118118
- job: Windows

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

azure-pipelines/official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ extends:
8080
os: Linux
8181
macOSPool:
8282
name: Azure Pipelines
83-
vmImage: macOS-14
83+
vmImage: macOS-15
8484
os: macOS
8585
EnableMacOSBuild: ${{ parameters.EnableMacOSBuild }}
8686
RunTests: ${{ parameters.RunTests }}

azure-pipelines/unofficial.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ extends:
9393
os: Linux
9494
macOSPool:
9595
name: Azure Pipelines
96-
vmImage: macOS-14
96+
vmImage: macOS-15
9797
os: macOS
9898
EnableMacOSBuild: ${{ parameters.EnableMacOSBuild }}
9999
RunTests: ${{ parameters.RunTests }}

azure-pipelines/vs-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extends:
5454
os: Linux
5555
macOSPool:
5656
name: Azure Pipelines
57-
vmImage: macOS-14
57+
vmImage: macOS-15
5858
os: macOS
5959
EnableMacOSBuild: false
6060
RunTests: false

0 commit comments

Comments
 (0)