Skip to content

Commit a575ec8

Browse files
committed
[ci] Move Windows build and test to VS2019
We've been encountering a handful of issues recently with the Windows machine pool we're using for building and testing. There have been quite a few failures caused by files being locked, or dependencies being out of date or missing. Moving to the VSEng VS2019 Windows pool will hopefully resolve some of these issues. Unfortunately the size of our build dependencies presents an issue when attempting to use the Microsoft hosted Windows VS2019 agents, as our Win job ultimately runs out of space when executing on those VMS. Using the VSEng VS2019 pool will allow us to migrate to VS2019 while avoiding disk space limitations.
1 parent 04a4308 commit a575ec8

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ variables:
2121
InstallerArtifactName: installers
2222
TestAssembliesArtifactName: test-assemblies
2323
NUnitConsoleVersion: 3.9.0
24+
DotNetCoreVersion: 2.1.701
2425
HostedWinVS2019: Hosted Windows 2019 with VS2019
26+
VSEngWinVS2019: VSEng-MicroBuildVS2019
2527

2628
# Stage and Job "display names" are shortened because they are combined to form the name of the corresponding GitHub check.
2729
stages:
@@ -54,9 +56,9 @@ stages:
5456
submodules: recursive
5557

5658
- task: UseDotNet@2
57-
displayName: install .NET Core 2.1.701
59+
displayName: install .NET Core $(DotNetCoreVersion)
5860
inputs:
59-
version: 2.1.701
61+
version: $(DotNetCoreVersion)
6062

6163
# Update Mono in a separate step since xaprepare uses it as well and it will crash when Mono it runs with is updated
6264
# The 'prepare' step creates the bundle
@@ -103,9 +105,9 @@ stages:
103105
submodules: recursive
104106

105107
- task: UseDotNet@2
106-
displayName: install .NET Core 2.1.701
108+
displayName: install .NET Core $(DotNetCoreVersion)
107109
inputs:
108-
version: 2.1.701
110+
version: $(DotNetCoreVersion)
109111

110112
- task: DownloadPipelineArtifact@1
111113
inputs:
@@ -198,7 +200,7 @@ stages:
198200
- job: queue_vsix_signing
199201
displayName: Queue Vsix Signing
200202
dependsOn: mac_build_create_installers
201-
pool: $(XA.Build.Win.Pool)
203+
pool: $(VSEngWinVS2019)
202204
condition: and(eq(dependencies.mac_build_create_installers.result, 'Succeeded'), eq(variables['XA.Commercial.Build'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
203205
timeoutInMinutes: 45
204206
cancelTimeoutInMinutes: 1
@@ -226,7 +228,7 @@ stages:
226228
jobs:
227229
- job: win_build_test
228230
displayName: Build and Test
229-
pool: $(XA.Build.Win.Pool)
231+
pool: $(VSEngWinVS2019)
230232
timeoutInMinutes: 360
231233
cancelTimeoutInMinutes: 5
232234
workspace:
@@ -240,6 +242,11 @@ stages:
240242
- checkout: self
241243
submodules: recursive
242244

245+
- task: UseDotNet@2
246+
displayName: install .NET Core $(DotNetCoreVersion)
247+
inputs:
248+
version: $(DotNetCoreVersion)
249+
243250
- task: DownloadPipelineArtifact@1
244251
inputs:
245252
artifactName: $(BundleArtifactName)

build-tools/automation/yaml-templates/mac/setup-test-environment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ steps:
1818
displayName: install xaprepare dependencies
1919

2020
- task: UseDotNet@2
21-
displayName: install .NET Core 2.1.701
21+
displayName: install .NET Core $(DotNetCoreVersion)
2222
inputs:
23-
version: 2.1.701
23+
version: $(DotNetCoreVersion)
2424

2525
# Restore solutions for Xamarin.Android.Tools.sln, Xamarin.Android.sln, and Xamarin.Android-Tests.sln
2626
- task: NuGetCommand@2

0 commit comments

Comments
 (0)