Roll chrome to 132 (#2871)

* Roll chrome to 132 * Fix firefox download * Fix xz process
hardkoded · Feb 4, 2025 · d20a46e · d20a46e
1 parent 1459dbe
commit d20a46e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/lib/PuppeteerSharp/BrowserData/Chrome.cs b/lib/PuppeteerSharp/BrowserData/Chrome.cs
@@ -13,7 +13,7 @@ public static class Chrome
         /// <summary>
         /// Default chrome build.
         /// </summary>
-        public static string DefaultBuildId => "130.0.6723.69";
+        public static string DefaultBuildId => "132.0.6834.83";
 
         internal static async Task<string> ResolveBuildIdAsync(ChromeReleaseChannel channel)
             => (await GetLastKnownGoodReleaseForChannel(channel).ConfigureAwait(false)).Version;

diff --git a/lib/PuppeteerSharp/BrowserData/Firefox.cs b/lib/PuppeteerSharp/BrowserData/Firefox.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -181,12 +182,18 @@ private static string GetFirefoxPlatform(Platform platform)
         private static string GetArchiveNightly(Platform platform, string buildId)
             => platform switch
             {
-                Platform.Linux => $"firefox-{buildId}.en-US.{GetFirefoxPlatform(platform)}-x86_64.tar.bz2",
+                Platform.Linux => $"firefox-{buildId}.en-US.{GetFirefoxPlatform(platform)}-x86_64.tar.{GetFormat(buildId)}",
                 Platform.MacOS or Platform.MacOSArm64 => $"firefox-{buildId}.en-US.mac.dmg",
                 Platform.Win32 or Platform.Win64 => $"firefox-{buildId}.en-US.{GetFirefoxPlatform(platform)}.zip",
                 _ => throw new PuppeteerException($"Unknown platform: {platform}"),
             };
 
+        private static string GetFormat(string buildId)
+        {
+            var majorVersion = int.Parse(buildId.Split('.')[0], CultureInfo.CurrentCulture);
+            return majorVersion >= 135 ? "xz" : "bz2";
+        }
+
         private static string GetArchive(Platform platform, string buildId)
             => platform switch
             {

diff --git a/lib/PuppeteerSharp/BrowserFetcher.cs b/lib/PuppeteerSharp/BrowserFetcher.cs
@@ -209,10 +209,11 @@ internal static string GetBrowsersLocation()
 
         private static void ExtractTar(string zipPath, string folderPath)
         {
+            var compression = zipPath.EndsWith("xz", StringComparison.InvariantCulture) ? "J" : "j";
             new DirectoryInfo(folderPath).Create();
             using var process = new Process();
             process.StartInfo.FileName = "tar";
-            process.StartInfo.Arguments = $"-xvjf \"{zipPath}\" -C \"{folderPath}\"";
+            process.StartInfo.Arguments = $"-xv{compression}f \"{zipPath}\" -C \"{folderPath}\"";
             process.StartInfo.RedirectStandardOutput = true;
             process.StartInfo.UseShellExecute = false;
             process.Start();
@@ -433,7 +434,7 @@ private async Task UnpackArchiveAsync(string archivePath, string outputPath, str
             {
                 ExecuteSetup(archivePath, outputPath);
             }
-            else if (archivePath.EndsWith(".tar.bz2", StringComparison.OrdinalIgnoreCase))
+            else if (archivePath.Contains(".tar."))
             {
                 ExtractTar(archivePath, outputPath);
             }

diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -12,10 +12,10 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>20.0.5</PackageVersion>
-    <ReleaseVersion>20.0.5</ReleaseVersion>
-    <AssemblyVersion>20.0.5</AssemblyVersion>
-    <FileVersion>20.0.5</FileVersion>
+    <PackageVersion>20.1.0</PackageVersion>
+    <ReleaseVersion>20.1.0</ReleaseVersion>
+    <AssemblyVersion>20.1.0</AssemblyVersion>
+    <FileVersion>20.1.0</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <DebugType>embedded</DebugType>