Merge branch 'master' into smoketesting

Author: peiche-ms

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,9 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [[email protected]](mailto:[email protected]) with questions or concerns

SampleApps/WebView2APISample/AppWindow.cpp

@@ -716,7 +716,7 @@ HRESULT AppWindow::OnCreateCoreWebView2ControllerCompleted(HRESULT result, ICore
             m_creationModeId == IDM_CREATION_MODE_TARGET_DCOMP);
         NewComponent<ControlComponent>(this, &m_toolbar);
 
-        m_webView3 = coreWebView2.query<ICoreWebView2_3>();
+        m_webView3 = coreWebView2.try_query<ICoreWebView2_3>();
         if (m_webView3)
         {
             //! [AddVirtualHostNameToFolderMapping]

SampleApps/WebView2APISample/SettingsComponent.cpp

@@ -42,9 +42,12 @@ SettingsComponent::SettingsComponent(
             old->m_settings.try_query<ICoreWebView2ExperimentalSettings>();
         wil::com_ptr<ICoreWebView2ExperimentalSettings> experimental_settings_new;
         experimental_settings_new = m_settings.try_query<ICoreWebView2ExperimentalSettings>();
-        LPWSTR user_agent;
-        CHECK_FAILURE(experimental_settings_old->get_UserAgent(&user_agent));
-        CHECK_FAILURE(experimental_settings_new->put_UserAgent(user_agent));
+        if (experimental_settings_old && experimental_settings_new)
+        {
+            LPWSTR user_agent;
+            CHECK_FAILURE(experimental_settings_old->get_UserAgent(&user_agent));
+            CHECK_FAILURE(experimental_settings_new->put_UserAgent(user_agent));
+        }
         SetBlockImages(old->m_blockImages);
         SetReplaceImages(old->m_replaceImages);
         m_deferScriptDialogs = old->m_deferScriptDialogs;

SampleApps/WebView2APISample/WebView2APISample.vcxproj

@@ -502,13 +502,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\Microsoft.Web.WebView2.1.0.781-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.781-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\packages\Microsoft.Web.WebView2.1.0.790-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.790-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <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>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.781-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.781-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.790-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.790-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
 </Project>

SampleApps/WebView2APISample/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.781-prerelease" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.790-prerelease" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.191107.2" targetFramework="native" />
 </packages>

SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj

@@ -19,7 +19,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.781-prerelease" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.790-prerelease" />
   </ItemGroup>
   <ItemGroup>
     <None Update="assets\EdgeWebView2-80.jpg">

SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj

@@ -25,6 +25,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.781-prerelease" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.790-prerelease" />
   </ItemGroup>
 </Project>