Skip to content

Commit 42b1fd0

Browse files
authored
Fix chromium version fetcher (#2654)
1 parent 3a2a395 commit 42b1fd0

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

lib/PuppeteerSharp/BrowserFetcher.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,13 @@ public async Task<bool> CanDownloadAsync(string revision)
102102
/// <inheritdoc/>
103103
public async Task<InstalledBrowser> DownloadAsync()
104104
{
105-
var buildId = Browser == SupportedBrowser.Firefox
106-
? await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false)
107-
: Chrome.DefaultBuildId;
105+
var buildId = Browser switch
106+
{
107+
SupportedBrowser.Firefox => await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false),
108+
SupportedBrowser.Chrome or SupportedBrowser.ChromeHeadlessShell => Chrome.DefaultBuildId,
109+
SupportedBrowser.Chromium => await Chromium.ResolveBuildIdAsync(Platform).ConfigureAwait(false),
110+
_ => throw new PuppeteerException($"{Browser} not supported."),
111+
};
108112

109113
return await DownloadAsync(buildId).ConfigureAwait(false);
110114
}

lib/PuppeteerSharp/Launcher.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,14 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
5050

5151
EnsureSingleLaunchOrConnect();
5252
_browser = options.Browser;
53-
var executable = options.ExecutablePath ?? GetExecutablePath(
54-
options,
55-
options.Browser == SupportedBrowser.Firefox ? await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false) : Chrome.DefaultBuildId);
53+
var buildId = options.Browser switch
54+
{
55+
SupportedBrowser.Firefox => await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false),
56+
SupportedBrowser.Chrome or SupportedBrowser.ChromeHeadlessShell => Chrome.DefaultBuildId,
57+
SupportedBrowser.Chromium => await Chromium.ResolveBuildIdAsync(BrowserFetcher.GetCurrentPlatform()).ConfigureAwait(false),
58+
_ => throw new ArgumentException("Invalid browser"),
59+
};
60+
var executable = options.ExecutablePath ?? GetExecutablePath(options, buildId);
5661

5762
Process = options.Browser switch
5863
{

lib/PuppeteerSharp/PuppeteerSharp.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<Description>Headless Browser .NET API</Description>
1313
<PackageId>PuppeteerSharp</PackageId>
1414
<PackageReleaseNotes></PackageReleaseNotes>
15-
<PackageVersion>18.0.0</PackageVersion>
16-
<ReleaseVersion>18.0.0</ReleaseVersion>
17-
<AssemblyVersion>18.0.0</AssemblyVersion>
15+
<PackageVersion>18.0.1</PackageVersion>
16+
<ReleaseVersion>18.0.1</ReleaseVersion>
17+
<AssemblyVersion>18.0.1</AssemblyVersion>
1818
<FileVersion>18.0.0</FileVersion>
1919
<SynchReleaseVersion>false</SynchReleaseVersion>
2020
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>

0 commit comments

Comments
 (0)