Fix chromium version fetcher (#2654)

hardkoded · Jun 6, 2024 · 42b1fd0 · 42b1fd0
1 parent 3a2a395
commit 42b1fd0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/lib/PuppeteerSharp/BrowserFetcher.cs b/lib/PuppeteerSharp/BrowserFetcher.cs
@@ -102,9 +102,13 @@ public async Task<bool> CanDownloadAsync(string revision)
         /// <inheritdoc/>
         public async Task<InstalledBrowser> DownloadAsync()
         {
-            var buildId = Browser == SupportedBrowser.Firefox
-                ? await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false)
-                : Chrome.DefaultBuildId;
+            var buildId = Browser switch
+            {
+                SupportedBrowser.Firefox => await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false),
+                SupportedBrowser.Chrome or SupportedBrowser.ChromeHeadlessShell => Chrome.DefaultBuildId,
+                SupportedBrowser.Chromium => await Chromium.ResolveBuildIdAsync(Platform).ConfigureAwait(false),
+                _ => throw new PuppeteerException($"{Browser} not supported."),
+            };
 
             return await DownloadAsync(buildId).ConfigureAwait(false);
         }

diff --git a/lib/PuppeteerSharp/Launcher.cs b/lib/PuppeteerSharp/Launcher.cs
@@ -50,9 +50,14 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
 
             EnsureSingleLaunchOrConnect();
             _browser = options.Browser;
-            var executable = options.ExecutablePath ?? GetExecutablePath(
-                options,
-                options.Browser == SupportedBrowser.Firefox ? await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false) : Chrome.DefaultBuildId);
+            var buildId = options.Browser switch
+            {
+                SupportedBrowser.Firefox => await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false),
+                SupportedBrowser.Chrome or SupportedBrowser.ChromeHeadlessShell => Chrome.DefaultBuildId,
+                SupportedBrowser.Chromium => await Chromium.ResolveBuildIdAsync(BrowserFetcher.GetCurrentPlatform()).ConfigureAwait(false),
+                _ => throw new ArgumentException("Invalid browser"),
+            };
+            var executable = options.ExecutablePath ?? GetExecutablePath(options, buildId);
 
             Process = options.Browser switch
             {

diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -12,9 +12,9 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>18.0.0</PackageVersion>
-    <ReleaseVersion>18.0.0</ReleaseVersion>
-    <AssemblyVersion>18.0.0</AssemblyVersion>
+    <PackageVersion>18.0.1</PackageVersion>
+    <ReleaseVersion>18.0.1</ReleaseVersion>
+    <AssemblyVersion>18.0.1</AssemblyVersion>
     <FileVersion>18.0.0</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>