Skip to content

Commit cc04416

Browse files
committed
Update WebView2 to 1.0.1518.46
1 parent bab67e2 commit cc04416

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/WinWebDiffLib/WebWindow.hpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <cassert>
1010
#include <functional>
1111
#include <WebView2.h>
12-
#include <WebView2Experimental.h>
1312
#include <WebView2EnvironmentOptions.h>
1413
#include <CommCtrl.h>
1514
#include <Shlwapi.h>
@@ -1182,15 +1181,15 @@ class CWebWindow
11821181
{
11831182
if (!GetActiveWebView())
11841183
return E_FAIL;
1185-
auto webView2Experimental8 = GetActiveTab()->m_webview.try_query<ICoreWebView2Experimental8>();
1186-
if (!webView2Experimental8)
1184+
auto webView2_13 = GetActiveTab()->m_webview.try_query<ICoreWebView2_13>();
1185+
if (!webView2_13)
11871186
return E_FAIL;
1188-
wil::com_ptr<ICoreWebView2ExperimentalProfile> webView2Profile;
1189-
webView2Experimental8->get_Profile(&webView2Profile);
1187+
wil::com_ptr<ICoreWebView2Profile> webView2Profile;
1188+
webView2_13->get_Profile(&webView2Profile);
11901189
if (!webView2Profile)
11911190
return E_FAIL;
1192-
auto webView2ExperimentalProfile4 = webView2Profile.try_query<ICoreWebView2ExperimentalProfile4>();
1193-
return webView2ExperimentalProfile4->ClearBrowsingData(static_cast<COREWEBVIEW2_BROWSING_DATA_KINDS>(dataKinds), nullptr);
1191+
auto webView2Profile2 = webView2Profile.try_query<ICoreWebView2Profile2>();
1192+
return webView2Profile2->ClearBrowsingData(static_cast<COREWEBVIEW2_BROWSING_DATA_KINDS>(dataKinds), nullptr);
11941193
}
11951194

11961195
HRESULT SetToolTipText(const std::wstring& text)

src/WinWebDiffLib/WinWebDiffLib.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,15 @@
299299
<ImportGroup Label="ExtensionTargets">
300300
<Import Project="$(SolutionDir)packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
301301
<Import Project="$(SolutionDir)packages\tencent.rapidjson.1.1.1\build\tencent.rapidjson.targets" Condition="Exists('$(SolutionDir)packages\tencent.rapidjson.1.1.1\build\tencent.rapidjson.targets')" />
302-
<Import Project="$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1189-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1189-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
302+
<Import Project="$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets')" />
303303
</ImportGroup>
304304
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
305305
<PropertyGroup>
306306
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
307307
</PropertyGroup>
308308
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
309309
<Error Condition="!Exists('$(SolutionDir)packages\tencent.rapidjson.1.1.1\build\tencent.rapidjson.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\tencent.rapidjson.1.1.1\build\tencent.rapidjson.targets'))" />
310-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1189-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1189-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
310+
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1518.46\build\native\Microsoft.Web.WebView2.targets'))" />
311311
</Target>
312312
<PropertyGroup>
313313
<WebView2LoaderPreference>Static</WebView2LoaderPreference>

src/WinWebDiffLib/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Web.WebView2" version="1.0.1189-prerelease" targetFramework="native" />
3+
<package id="Microsoft.Web.WebView2" version="1.0.1518.46" targetFramework="native" />
44
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.191107.2" targetFramework="native" />
55
<package id="tencent.rapidjson" version="1.1.1" targetFramework="native" />
6-
</packages>
6+
</packages>

0 commit comments

Comments
 (0)