Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/testing/BrowserVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<linux_ChromeRevision>1536371</linux_ChromeRevision>
<linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1536376</linux_ChromeBaseSnapshotUrl>
<linux_V8Version>14.3.127</linux_V8Version>
<macos_ChromeVersion>143.0.7499.40</macos_ChromeVersion>
<macos_ChromeRevision>1536371</macos_ChromeRevision>
<macos_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Mac_Arm/1536376</macos_ChromeBaseSnapshotUrl>
<macos_V8Version>14.3.127</macos_V8Version>
<win_ChromeVersion>143.0.7499.40</win_ChromeVersion>
<win_ChromeRevision>1536371</win_ChromeRevision>
<win_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1536376</win_ChromeBaseSnapshotUrl>
Expand Down
32 changes: 26 additions & 6 deletions eng/testing/wasm-provisioning.targets
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,26 @@
<_V8PlatformId>linux64</_V8PlatformId>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('macos'))">
Comment thread
radekdoulik marked this conversation as resolved.
<ChromeDirName>chrome-mac/Chromium.app/Contents/MacOS</ChromeDirName>
<ChromeDriverDirName>chromedriver_mac64</ChromeDriverDirName>
<ChromeBinaryName>Chromium</ChromeBinaryName>
<ChromeDriverBinaryName>chromedriver</ChromeDriverBinaryName>
<_ChromeOSPrefix>Mac_Arm</_ChromeOSPrefix>

<ChromeVersion>$(macos_ChromeVersion)</ChromeVersion>
<ChromeRevision>$(macos_ChromeRevision)</ChromeRevision>
<_ChromeBaseSnapshotUrl>$(macos_ChromeBaseSnapshotUrl)</_ChromeBaseSnapshotUrl>

<ChromeUrl>$(macos_ChromeBaseSnapshotUrl)/chrome-mac.zip</ChromeUrl>
<ChromeDriverUrl>$(macos_ChromeBaseSnapshotUrl)/chromedriver_mac64.zip</ChromeDriverUrl>
Comment thread
radekdoulik marked this conversation as resolved.

<V8Version>$(macos_V8Version)</V8Version>
<V8DirName>v8-$(macos_V8Version)</V8DirName>
<V8BinaryName>$(V8DirName).sh</V8BinaryName>
<_V8PlatformId>mac-arm64</_V8PlatformId>
Comment thread
radekdoulik marked this conversation as resolved.
</PropertyGroup>
Comment thread
radekdoulik marked this conversation as resolved.

<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))">
<ChromeDirName>chrome-win</ChromeDirName>
<ChromeDriverDirName>chromedriver_win32</ChromeDriverDirName>
Expand Down Expand Up @@ -109,8 +129,8 @@
AfterTargets="$(WasmProvisionAfterTarget)"
Condition="(!Exists($(ChromeStampFile)) or !Exists($(ChromeBinaryPath))) and '$(InstallChromeForTests)' == 'true'">

<Error Condition="!$([MSBuild]::IsOSPlatform('linux')) and !$([MSBuild]::IsOSPlatform('windows'))"
Text="Chrome provisioning only supported on Linux, and windows." />
<Error Condition="!$([MSBuild]::IsOSPlatform('linux')) and !$([MSBuild]::IsOSPlatform('windows')) and !$([MSBuild]::IsOSPlatform('macos'))"
Comment thread
radekdoulik marked this conversation as resolved.
Text="Chrome provisioning only supported on Linux, Windows, and macOS." />
<Error Condition="'$(ChromeVersion)' == ''"
Text="No %24(ChromeVersion) set. This can be set in eng/testing/BrowserVersions.props" />

Expand All @@ -137,8 +157,8 @@
AfterTargets="$(WasmProvisionAfterTarget)"
Condition="(!Exists($(ChromeDriverStampFile)) or !Exists($(ChromeDriverBinaryPath))) and '$(InstallChromeForTests)' == 'true'">

<Error Condition="!$([MSBuild]::IsOSPlatform('linux')) and !$([MSBuild]::IsOSPlatform('windows'))"
Text="ChromeDriver provisioning only supported on Linux, and windows." />
<Error Condition="!$([MSBuild]::IsOSPlatform('linux')) and !$([MSBuild]::IsOSPlatform('windows')) and !$([MSBuild]::IsOSPlatform('macos'))"
Text="ChromeDriver provisioning only supported on Linux, Windows, and macOS." />
Comment thread
radekdoulik marked this conversation as resolved.
<Error Condition="'$(ChromeVersion)' == ''"
Text="No %24(ChromeVersion) set. This can be set in eng/testing/BrowserVersions.props" />

Expand All @@ -164,8 +184,8 @@
AfterTargets="$(WasmProvisionAfterTarget)"
Condition="(!Exists($(V8StampFile)) or !Exists($(V8BinaryPath))) and '$(InstallV8ForTests)' == 'true'">

<Error Condition="!$([MSBuild]::IsOSPlatform('linux')) and !$([MSBuild]::IsOSPlatform('windows'))"
Text="V8 provisioning only supported on Linux, and windows." />
<Error Condition="!$([MSBuild]::IsOSPlatform('linux')) and !$([MSBuild]::IsOSPlatform('windows')) and !$([MSBuild]::IsOSPlatform('macos'))"
Text="V8 provisioning only supported on Linux, Windows, and macOS." />
Comment thread
radekdoulik marked this conversation as resolved.
<Error Condition="'$(V8Version)' == ''" Text="%24(V8Version) not set" />
<Error Condition="'$(_V8PlatformId)' == ''" Text="%24(_V8PlatformId) not set, needed for constructing the snapshot url." />

Expand Down
Loading