Skip to content

Commit 924c71b

Browse files
authored
Only get build ID if executable path is not supplied. (#2801)
* Only get build ID if executable path is not supplied. fixes #2800 * Update version to 20.0.2
1 parent 71ff822 commit 924c71b

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

lib/PuppeteerSharp/Launcher.cs

+12-7
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,19 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
5151

5252
EnsureSingleLaunchOrConnect();
5353
_browser = options.Browser;
54-
var buildId = options.Browser switch
54+
55+
var executable = options.ExecutablePath;
56+
if (executable == null)
5557
{
56-
SupportedBrowser.Firefox => await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false),
57-
SupportedBrowser.Chrome or SupportedBrowser.ChromeHeadlessShell => Chrome.DefaultBuildId,
58-
SupportedBrowser.Chromium => await Chromium.ResolveBuildIdAsync(BrowserFetcher.GetCurrentPlatform()).ConfigureAwait(false),
59-
_ => throw new ArgumentException("Invalid browser"),
60-
};
61-
var executable = options.ExecutablePath ?? GetExecutablePath(options, buildId);
58+
var buildId = options.Browser switch
59+
{
60+
SupportedBrowser.Firefox => await Firefox.GetDefaultBuildIdAsync().ConfigureAwait(false),
61+
SupportedBrowser.Chrome or SupportedBrowser.ChromeHeadlessShell => Chrome.DefaultBuildId,
62+
SupportedBrowser.Chromium => await Chromium.ResolveBuildIdAsync(BrowserFetcher.GetCurrentPlatform()).ConfigureAwait(false),
63+
_ => throw new ArgumentException("Invalid browser"),
64+
};
65+
executable = GetExecutablePath(options, buildId);
66+
}
6267

6368
Process = options.Browser switch
6469
{

lib/PuppeteerSharp/PuppeteerSharp.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<Description>Headless Browser .NET API</Description>
1313
<PackageId>PuppeteerSharp</PackageId>
1414
<PackageReleaseNotes></PackageReleaseNotes>
15-
<PackageVersion>20.0.2</PackageVersion>
16-
<ReleaseVersion>20.0.2</ReleaseVersion>
17-
<AssemblyVersion>20.0.2</AssemblyVersion>
18-
<FileVersion>20.0.2</FileVersion>
15+
<PackageVersion>20.0.3</PackageVersion>
16+
<ReleaseVersion>20.0.3</ReleaseVersion>
17+
<AssemblyVersion>20.0.3</AssemblyVersion>
18+
<FileVersion>20.0.3</FileVersion>
1919
<SynchReleaseVersion>false</SynchReleaseVersion>
2020
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
2121
<DebugType>embedded</DebugType>

0 commit comments

Comments
 (0)