-
Notifications
You must be signed in to change notification settings - Fork 677
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor ensuring WebView2 runtime, add WebView2 TestSuite D #6120
Conversation
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
89ccc29
to
5356c37
Compare
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
5356c37
to
3f9d08e
Compare
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
@@ -114,53 +176,63 @@ public static void EnsureBrowser() | |||
{ | |||
Log.Error("WebView2Tests Init: could not find loader at {0} [exception: {1}]", loaderPath, e.ToString()); | |||
} | |||
return loaderBuildVersion; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We no longer rely on webview2loader.dll (in favor of the winrt wrapper)... is it ok to still rely on geting the version from this file (which is still present in the package for COM CWV2SDK)? I wonder if there is a better way to get the "SDK version"... #WontFix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's keep for now and update in another change.
@@ -65,16 +65,75 @@ private static void DownloadFile(string url, string filePath) | |||
task.Wait(TimeSpan.FromMinutes(10)); | |||
} | |||
|
|||
// Ensure a suitable version of Anaheim Browser is present, if not use mini_installer to install one on the beta channel. | |||
// Ensure a suitable version of Anaheim Browser is present, if not use mini_installer to install the runtime. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed.
} | ||
} | ||
} | ||
|
||
private static Microsoft.Win32.RegistryKey GetBrowserExecutableFolderKey() | ||
{ | ||
return Microsoft.Win32.Registry.LocalMachine.CreateSubKey(@"Software\Policies\Microsoft\Edge\WebView2\BrowserExecutableFolder", true); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's keep for now and update in another change.
@jevansaks and @DmitriyKomin is this ready to check in? In reply to: 951275901 |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yep, just approved. Thanks! In reply to: 951275901 |
🎉 Handy links: |
🎉 Handy links: |
🎉 Handy links: |
Cleans up code for ensuring a machine has the proper WebView2 runtime before running tests. Also splits WebView2 tests into four test suites instead of three, to guard against hitting timeouts from trying to run too many tests.