[Automated] Sync v.next with main (#1688)

Co-authored-by: Ian Malcolm <[email protected]>

Author: arcgis-maps-sdk-bot

src/Directory.Packages.props

@@ -14,6 +14,7 @@
     <PackageVersion Include="Esri.ArcGISRuntime.Toolkit.WinUI" Version="$(ArcGISMapsSDKVersion)" />
     <PackageVersion Include="Esri.Calcite.Maui" Version="0.1.0-preview1" />
     <PackageVersion Include="Markdig" Version="0.37.0" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3537.50" />
     <PackageVersion Include="System.Text.Json" Version="9.0.2" />
     <PackageVersion Include="System.Speech" Version="8.0.0" />
     <PackageVersion Include="System.Drawing.Common" Version="8.0.6" />
@@ -31,4 +32,4 @@
     <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
     <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.4" />
   </ItemGroup>
-</Project>
+</Project>

src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
@@ -61,6 +61,7 @@
     <PackageReference Include="Esri.ArcGISRuntime.Toolkit.WPF" />
     <PackageReference Include="Esri.ArcGISRuntime.WPF" />
     <PackageReference Include="Markdig" />
+    <PackageReference Include="Microsoft.Web.WebView2" />
     <PackageReference Include="System.Speech" />
   </ItemGroup>
   <ItemGroup>

src/WPF/WPF.Viewer/Helpers/ArcGISLoginPrompt.cs

@@ -8,12 +8,12 @@
 // language governing permissions and limitations under the License.
 
 using Esri.ArcGISRuntime.Security;
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Navigation;
 using System.Windows.Threading;
 
 namespace ArcGIS.Helpers
@@ -115,18 +115,17 @@ public Task<IDictionary<string, string>> AuthorizeAsync(Uri serviceUri, Uri auth
             // Challenge for OAuth credentials on the UI thread.
             private void AuthorizeOnUIThread(string authorizeUri)
             {
-                // Create a WebBrowser control to display the authorize page.
-                WebBrowser webBrowser = new WebBrowser();
+                // Initialize a WebView2 control to display the authorize page.
+                WebView2 webBrowser = new WebView2() { MinWidth = 500, MinHeight = 500 };
 
                 // Handle the navigation event for the browser to check for a response to the redirect URL.
-                webBrowser.Navigating += WebBrowserOnNavigating;
+                webBrowser.NavigationStarting += WebBrowserOnNavigationStarting;
 
                 // Display the web browser in a new window.
                 _authWindow = new Window
                 {
                     Content = webBrowser,
-                    Width = 450,
-                    Height = 450,
+                    SizeToContent = SizeToContent.WidthAndHeight,
                     WindowStartupLocation = WindowStartupLocation.CenterOwner
                 };
 
@@ -136,9 +135,15 @@ private void AuthorizeOnUIThread(string authorizeUri)
                     _authWindow.Owner = Application.Current.MainWindow;
                 }
 
-                // Handle the window closed event then navigate to the authorize url.
+                // Handle window loaded event as the WebView2 control can only be initialized after it is visible in the UI
+                _authWindow.Loaded += async (s, e) =>
+                {
+                    await webBrowser.EnsureCoreWebView2Async();
+                    webBrowser.CoreWebView2.Navigate(authorizeUri);
+                };
+
+                // Handle the window closed event
                 _authWindow.Closed += OnWindowClosed;
-                webBrowser.Navigate(authorizeUri);
 
                 // Display the window.
                 _authWindow.ShowDialog();
@@ -163,17 +168,16 @@ private void OnWindowClosed(object sender, EventArgs e)
                 _authWindow = null;
             }
 
-            // Handle browser navigation (content changing).
-            private void WebBrowserOnNavigating(object sender, NavigatingCancelEventArgs e)
+            // Handle browser navigation
+            private void WebBrowserOnNavigationStarting(object sender, CoreWebView2NavigationStartingEventArgs e)
             {
                 // Check for a response to the callback url.
                 const string portalApprovalMarker = "/oauth2/approval";
-                WebBrowser webBrowser = sender as WebBrowser;
 
-                Uri uri = e.Uri;
+                Uri uri = new Uri(e.Uri);
 
                 // If no browser, uri, or an empty url, return.
-                if (webBrowser == null || uri == null || string.IsNullOrEmpty(uri.AbsoluteUri))
+                if (sender == null || uri == null || string.IsNullOrEmpty(uri.AbsoluteUri))
                     return;
 
                 // Check for redirect.