diff --git a/eng/testing/ChromeVersions.props b/eng/testing/ChromeVersions.props index ecf01665114ddd..c919397b3a06ec 100644 --- a/eng/testing/ChromeVersions.props +++ b/eng/testing/ChromeVersions.props @@ -1,12 +1,12 @@ - 122.0.6261.69 - 1250580 - https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1250580 - 12.2.281 - 122.0.6261.69 - 1250580 - https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1250586 - 12.2.281 + 123.0.6312.58 + 1262506 + https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1262506 + 12.3.219 + 123.0.6312.58 + 1262506 + https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1262514 + 12.3.219 - \ No newline at end of file + diff --git a/src/tasks/WasmBuildTasks/UpdateChromeVersions.cs b/src/tasks/WasmBuildTasks/UpdateChromeVersions.cs index f82623149628fd..71d359167fa16f 100644 --- a/src/tasks/WasmBuildTasks/UpdateChromeVersions.cs +++ b/src/tasks/WasmBuildTasks/UpdateChromeVersions.cs @@ -271,12 +271,12 @@ private async Task GetDownloadFileStreamAsync(string filename, string ur private async Task FindSnapshotUrlFromBasePositionAsync(string osPrefix, ChromeVersionSpec version, bool throwIfNotFound = true) { - string baseUrlForRevision = $"{s_snapshotBaseUrl}?prefix={osPrefix}"; + string baseUrl = $"{s_snapshotBaseUrl}/{osPrefix}"; int branchPosition = int.Parse(version.branch_base_position); for (int i = 0; i < MaxBranchPositionsToCheck; i++) { - string branchUrl = $"{baseUrlForRevision}/{branchPosition}"; + string branchUrl = $"{baseUrl}/{branchPosition}"; string url = $"{branchUrl}/REVISIONS"; Log.LogMessage(MessageImportance.Low, $"Checking if {url} exists .."); @@ -285,16 +285,14 @@ private async Task GetDownloadFileStreamAsync(string filename, string ur .ConfigureAwait(false); if (response.StatusCode == HttpStatusCode.OK) { - string baseUrlForDownload = $"{s_snapshotBaseUrl}/{osPrefix}"; - string snapshotUrl = $"{baseUrlForDownload}/{branchPosition}"; - Log.LogMessage(MessageImportance.Low, $"Found {url}. Snapshots should be under ${snapshotUrl}"); - return snapshotUrl; + Log.LogMessage(MessageImportance.Low, $"Found url = {url} with branchUrl = ${branchUrl}"); + return branchUrl; } branchPosition += 1; } - string message = $"Could not find a chrome snapshot folder under {baseUrlForRevision}, " + + string message = $"Could not find a chrome snapshot folder under {baseUrl}, " + $"for branch positions {version.branch_base_position} to " + $"{branchPosition}, for version {version.version}. " + "A fixed version+url can be set in eng/testing/ProvisioningVersions.props .";