Skip to content

Commit 2e06155

Browse files
authored
Merge pull request #56273 from dotnet/backport/pr-56270-to-release/6.0
[release/6.0] Bump to macos-12 build image
2 parents 27d2489 + 8093d4c commit 2e06155

23 files changed

+170
-193
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
9696
pool:
9797
${{ if eq(parameters.agentOs, 'macOS') }}:
98-
vmImage: macOS-11
98+
vmImage: macOS-12
9999
${{ if eq(parameters.agentOs, 'Linux') }}:
100100
${{ if and(eq(parameters.useHostedUbuntu, true), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
101101
vmImage: ubuntu-20.04
@@ -156,8 +156,8 @@ jobs:
156156
- script: df -h
157157
displayName: Disk size
158158
- ${{ if eq(parameters.agentOs, 'macOS') }}:
159-
- script: sudo xcode-select -s /Applications/Xcode_12.5.1.app/Contents/Developer
160-
displayName: Use XCode 12.5.1
159+
- script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
160+
displayName: Use XCode 14.2.0
161161
- checkout: self
162162
clean: true
163163
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
@@ -308,7 +308,7 @@ jobs:
308308
pool:
309309
${{ if eq(parameters.agentOs, 'macOS') }}:
310310
name: Azure Pipelines
311-
image: macOS-11
311+
image: macOS-12
312312
os: macOS
313313
${{ if eq(parameters.agentOs, 'Linux') }}:
314314
name: NetCore1ESPool-Svc-Internal
@@ -379,8 +379,8 @@ jobs:
379379
- script: df -h
380380
displayName: Disk size
381381
- ${{ if eq(parameters.agentOs, 'macOS') }}:
382-
- script: sudo xcode-select -s /Applications/Xcode_12.5.1.app/Contents/Developer
383-
displayName: Use XCode 12.5.1
382+
- script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
383+
displayName: Use XCode 14.2.0
384384
- checkout: self
385385
clean: true
386386
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:

.config/dotnet-tools.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-serve": {
6-
"version": "1.7.139",
6+
"version": "1.8.15",
77
"commands": [
88
"dotnet-serve"
99
]
1010
},
11-
"playwright-sharp-tool": {
12-
"version": "0.170.2",
11+
"Microsoft.Playwright.CLI": {
12+
"version": "1.2.2",
1313
"commands": [
14-
"playwright-sharp"
14+
"playwright"
1515
]
1616
}
1717
}

docs/Helix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Helix is the distributed test platform that we use to run tests. We build a helix payload that contains the publish directory of every test project that we want to test
44
send a job with with this payload to a set of queues for the various combinations of OS that we want to test
5-
for example: `Windows.10.Amd64.ClientRS4.VS2017.Open`, `OSX.1100.Amd64.Open`, `Ubuntu.1804.Amd64.Open`. Helix takes care of unzipping, running the job, and reporting results.
5+
for example: `Windows.10.Amd64.ClientRS4.VS2017.Open`, `OSX.1200.Amd64.Open`, `Ubuntu.1804.Amd64.Open`. Helix takes care of unzipping, running the job, and reporting results.
66

77
For more info about helix see: [SDK](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md), [JobSender](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md)
88

eng/Dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ and are generated based on the last package release.
188188
<LatestPackageReference Include="NuGet.Frameworks" />
189189
<LatestPackageReference Include="NuGet.Versioning" />
190190
<LatestPackageReference Include="Photino.NET" />
191-
<LatestPackageReference Include="PlaywrightSharp" />
191+
<LatestPackageReference Include="Microsoft.Playwright" />
192192
<LatestPackageReference Include="Polly" />
193193
<LatestPackageReference Include="Polly.Extensions.Http" />
194194
<LatestPackageReference Include="Selenium.Support" />

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
250250
<NSwagApiDescriptionClientVersion>13.0.4</NSwagApiDescriptionClientVersion>
251251
<PhotinoNETVersion>1.1.6</PhotinoNETVersion>
252-
<PlaywrightSharpVersion>0.192.0</PlaywrightSharpVersion>
252+
<MicrosoftPlaywrightVersion>1.17.3</MicrosoftPlaywrightVersion>
253253
<PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
254254
<PollyVersion>7.2.2</PollyVersion>
255255
<SeleniumSupportVersion>4.3.0</SeleniumSupportVersion>

eng/helix/content/RunTests/RunTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
<ItemGroup>
1010
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20158.1" />
11-
<PackageReference Condition=" '$(InstallPlaywright)' == 'true' " Include="PlaywrightSharp" Version="0.192.0" />
11+
<PackageReference Condition=" '$(InstallPlaywright)' == 'true' " Include="Microsoft.Playwright" Version="1.17.3" />
1212
</ItemGroup>
1313
</Project>

eng/helix/content/RunTests/TestRunner.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Threading;
1010
using System.Threading.Tasks;
1111
#if INSTALLPLAYWRIGHT
12-
using PlaywrightSharp;
12+
using Microsoft.Playwright;
1313
#endif
1414

1515
namespace RunTests
@@ -55,9 +55,6 @@ public bool SetupEnvironment()
5555
var playwrightBrowsers = Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH");
5656
ProcessUtil.PrintMessage($"Setting PLAYWRIGHT_BROWSERS_PATH: {playwrightBrowsers}");
5757
EnvironmentVariables.Add("PLAYWRIGHT_BROWSERS_PATH", playwrightBrowsers);
58-
var playrightDriver = Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH");
59-
ProcessUtil.PrintMessage($"Setting PLAYWRIGHT_DRIVER_PATH: {playrightDriver}");
60-
EnvironmentVariables.Add("PLAYWRIGHT_DRIVER_PATH", playrightDriver);
6158
#else
6259
ProcessUtil.PrintMessage($"Skipping setting PLAYWRIGHT_BROWSERS_PATH");
6360
#endif
@@ -112,8 +109,10 @@ public async Task<bool> InstallPlaywrightAsync()
112109
{
113110
try
114111
{
115-
ProcessUtil.PrintMessage($"Installing Playwright to Browsers: {Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH")} Driver: {Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH")}");
116-
await Playwright.InstallAsync(Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH"), Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH"));
112+
Console.WriteLine($"Installing Playwright Browsers to {Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH")}");
113+
114+
var exitCode = Microsoft.Playwright.Program.Main(new[] { "install" });
115+
117116
DisplayContents(Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH"));
118117
return true;
119118
}

eng/helix/content/runtests.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
1616
set DOTNET_MULTILEVEL_LOOKUP=0
1717
set InstallPlaywright=%$installPlaywright%
1818
set PLAYWRIGHT_BROWSERS_PATH=%CD%\ms-playwright
19-
set PLAYWRIGHT_DRIVER_PATH=%CD%\.playwright\win-x64\native\playwright.cmd
2019

2120
REM Avoid https://github.com/dotnet/aspnetcore/issues/41937 in current session.
2221
set ASPNETCORE_ENVIRONMENT=

eng/helix/content/runtests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export PATH="$PATH:$DIR:$DIR/node/bin"
2121
# Set playwright stuff
2222
export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
2323
if [[ "$helixQueue" == *"OSX"* ]]; then
24-
export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/osx/native/playwright.sh"
2524
PLAYWRIGHT_NODE_PATH=$DIR/.playwright/osx/native/node
2625
else
2726
export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"

eng/scripts/RunHelix.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Mariner
1313
Redhat.7.Amd64.Open
1414
Ubuntu.2004.Amd64.Open
15-
OSX.1100.Amd64.Open
15+
OSX.1200.Amd64.Open
1616
Windows.10.Amd64.Server20H2.Open
1717
Windows.11.Amd64.Client.Open
1818
Windows.Amd64.Server2022.Open

0 commit comments

Comments
 (0)