Skip to content

Commit bcac877

Browse files
committed
1 parent 547d719 commit bcac877

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.azure/default-build.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,27 +83,32 @@ jobs:
8383
dependsOn: ${{ parameters.dependsOn }}
8484
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
8585
enablePublishBuildAssets: false
86+
NativeToolsOnMachine: true
8687
${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
8788
enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
8889
enablePublishTestResults: true # publish test results to AzDO (populates AzDO Tests tab)
8990
enableTelemetry: true
9091
pool:
9192
${{ if eq(parameters.agentOs, 'macOS') }}:
9293
name: Azure Pipelines
93-
image: macOS-12
94+
image: macOS-13
9495
os: macOS
9596
${{ if eq(parameters.agentOs, 'Linux') }}:
9697
name: $(DncEngInternalBuildPool)
97-
image: 1es-ubuntu-2004
98+
image: 1es-ubuntu-2204
9899
os: linux
99100
${{ if eq(parameters.agentOs, 'Windows') }}:
100101
name: $(DncEngInternalBuildPool)
101-
image: windows.vs2019.amd64
102+
image: windows.vs2022preview.amd64
102103
os: windows
103104
steps:
104105
- checkout: self
105106
clean: true
106107

108+
- ${{ if eq(parameters.agentOs, 'Windows') }}:
109+
- script: eng\common\init-tools-native.cmd
110+
displayName: Install native dependencies
111+
107112
- task: CacheBeta@1
108113
inputs:
109114
key: vcpkg | ${{ parameters.agentOs }} | azure-pipelines.yml
@@ -145,4 +150,4 @@ jobs:
145150
inputs:
146151
testRunner: junit
147152
testResultsFiles: '$(Build.ArtifactStagingDirectory)/testOut/**/*.xml'
148-
testRunTitle: ${{ parameters.agentOs }}-unit_test
153+
testRunTitle: ${{ parameters.agentOs }}-unit_test

global.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@
1010
"msbuild-sdks": {
1111
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3",
1212
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24475.3"
13+
},
14+
"native-tools": {
15+
"cmake": "3.21.0"
1316
}
1417
}

0 commit comments

Comments
 (0)