diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 388bae509b..cd9fa42619 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">200.5.0</ArcGISMapsSDKVersion>
+    <ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">200.6.0</ArcGISMapsSDKVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
@@ -26,7 +26,7 @@
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageVersion Include="WinUIEx" Version="2.3.4" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" Condition="'$(UseMaui)'!='true'" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" Condition="'$(UseMaui)'!='true'" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" Condition="'$(UseMaui)'!='true'" />
     <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.1" />
     <PackageVersion Include="Microsoft.UI.Xaml" Version="2.5.0" />
diff --git a/src/MAUI/Maui.Samples/Helpers/ArcGISLoginPrompt.cs b/src/MAUI/Maui.Samples/Helpers/ArcGISLoginPrompt.cs
index 068fd9ece3..8d000c8dd7 100644
--- a/src/MAUI/Maui.Samples/Helpers/ArcGISLoginPrompt.cs
+++ b/src/MAUI/Maui.Samples/Helpers/ArcGISLoginPrompt.cs
@@ -74,23 +74,6 @@ public static void SetChallengeHandler()
             AuthenticationManager.Current.OAuthUserConfigurations.Add(userConfig);
             AuthenticationManager.Current.OAuthAuthorizeHandler = new OAuthAuthorize();
         }
-
-        // ChallengeHandler function that will be called whenever access to a secured resource is attempted.
-        public static async Task<Credential> PromptCredentialAsync(CredentialRequestInfo info)
-        {
-            Credential credential = null;
-
-            try
-            {
-                // IOAuthAuthorizeHandler will challenge the user for OAuth credentials.
-                credential = await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri);
-            }
-            // OAuth login was canceled, no need to display error to user.
-            catch (TaskCanceledException) { }
-            catch (OperationCanceledException) { }
-
-            return credential;
-        }
     }
 
     #region IOAuthAuthorizationHandler implementation
diff --git a/src/MAUI/Maui.Samples/Platforms/Android/AndroidManifest.xml b/src/MAUI/Maui.Samples/Platforms/Android/AndroidManifest.xml
index fdf5bc81c8..0f94b1a9ac 100644
--- a/src/MAUI/Maui.Samples/Platforms/Android/AndroidManifest.xml
+++ b/src/MAUI/Maui.Samples/Platforms/Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.esri.arcgisruntime.samples.maui" android:versionCode="3" android:versionName="200.5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.esri.arcgisruntime.samples.maui" android:versionCode="5" android:versionName="200.6.0">
 	<application android:allowBackup="true" android:usesCleartextTraffic="true" android:icon="@mipmap/appiconandroid" android:roundIcon="@mipmap/appiconandroid_round" android:supportsRtl="true" android:label="ArcGIS Maps .NET MAUI Samples"></application>
 	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs b/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
index 3eda36e298..66d27c28fb 100644
--- a/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
@@ -50,7 +50,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "editor01";
                     string sampleServer7Pass = "S7#i2LWmYH75";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
index 395fe14426..fb0efacb7a 100644
--- a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
+++ b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
@@ -142,10 +142,71 @@
                     VerticalOptions="Center">
                 <ScrollView>
                     <VerticalStackLayout Margin="10">
+                        <Grid ColumnDefinitions="auto,*">
+                            <Label Padding="0,5"
+                                   FontAttributes="Bold"
+                                   FontSize="14"
+                                   Text="Snap settings" />
+                            <Button Grid.Column="1"
+                                    Margin="20,0"
+                                    Clicked="EnableAllSnapSettingsButton_Click"
+                                    HorizontalOptions="End"
+                                    Text="Enable all"
+                                    VerticalOptions="Center" />
+                        </Grid>
+                        <VerticalStackLayout HeightRequest="130" WidthRequest="250">
+                            <Grid ColumnSpacing="3">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Label Grid.Column="0"
+                                       Text="Snapping"
+                                       VerticalOptions="Center"
+                                       WidthRequest="160" />
+                                <Switch Grid.Column="1"
+                                        HorizontalOptions="End"
+                                        IsToggled="{Binding GeometryEditor.SnapSettings.IsEnabled, Source={x:Reference MyMapView}}"
+                                        VerticalOptions="Center" />
+                            </Grid>
+                            <Grid ColumnSpacing="3">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Label Grid.Column="0"
+                                       Text="Geometry guides"
+                                       VerticalOptions="Center"
+                                       WidthRequest="160" />
+                                <Switch Grid.Column="1"
+                                        HorizontalOptions="End"
+                                        IsEnabled="{Binding GeometryEditor.SnapSettings.IsEnabled, Source={x:Reference MyMapView}}"
+                                        IsToggled="{Binding GeometryEditor.SnapSettings.IsGeometryGuidesEnabled, Source={x:Reference MyMapView}}"
+                                        VerticalOptions="Center" />
+                            </Grid>
+                            <Grid ColumnSpacing="3">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Label Grid.Column="0"
+                                       Text="Feature snapping"
+                                       VerticalOptions="Center"
+                                       WidthRequest="160" />
+                                <Switch Grid.Column="1"
+                                        HorizontalOptions="End"
+                                        IsEnabled="{Binding GeometryEditor.SnapSettings.IsEnabled, Source={x:Reference MyMapView}}"
+                                        IsToggled="{Binding GeometryEditor.SnapSettings.IsFeatureSnappingEnabled, Source={x:Reference MyMapView}}"
+                                        VerticalOptions="Center" />
+                            </Grid>
+                        </VerticalStackLayout>
+                        <BoxView Margin="0,0,0,5"
+                                 HeightRequest="1"
+                                 Color="White" />
                         <Label Padding="0,5"
                                FontAttributes="Bold"
                                FontSize="14"
-                               Text="Select snap sources" />
+                               Text="Snap sources" />
                         <Grid ColumnDefinitions="auto,*">
                             <Label Grid.Column="0"
                                    Text="Point layers:"
diff --git a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
index 3cbe39224f..5471aeb6f4 100644
--- a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
@@ -222,7 +222,15 @@ private void ResetFromEditingSession()
             _selectedGraphic = null;
         }
 
-        #region Enable Sources Button Handlers
+        #region Enable Snapping Button Handlers
+        // Enable all point layer snap sources.
+        private void EnableAllSnapSettingsButton_Click(object sender, EventArgs e)
+        {
+            _geometryEditor.SnapSettings.IsEnabled = true;
+            _geometryEditor.SnapSettings.IsGeometryGuidesEnabled = true;
+            _geometryEditor.SnapSettings.IsFeatureSnappingEnabled = true;
+        }
+
         // Enable all point layer snap sources.
         private void EnableAllPointSnapSourceButton_Click(object sender, EventArgs e)
         {
diff --git a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/readme.md b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/readme.md
index 5cb74ddf5d..1628d0b2d3 100644
--- a/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/readme.md
+++ b/src/MAUI/Maui.Samples/Samples/Geometry/SnapGeometryEdits/readme.md
@@ -12,7 +12,7 @@ A field worker can create new features by editing and snapping the vertices of a
 
 To create a geometry, press the create button to choose the geometry type you want to create (i.e. points, multipoints, polyline, or polygon) and interactively tap and drag on the map view to create the geometry.
 
-To configure snapping, press the snap settings button to enable or disable snapping and choose which snap sources to snap to.
+Snap settings can be configured by enabling and disabling snapping, feature snapping, geometry guides and snap sources.
 
 To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source and move the mouse pointer or drag a vertex to nearby an existing feature or graphic. When the pointer is close to that existing geoelement, the edit position will be adjusted to coincide with (or snap to), edges and vertices of its geometry. Tap or release the touch pointer to place the vertex at the snapped location.
 
@@ -31,7 +31,8 @@ To save your edits, press the save button.
 3. Create a `GeometryEditor` and connect it to the map view.
 4. Call `SyncSourceSettings` after the map's operational layers are loaded and the geometry editor has connected to the map view.
 5. Set `SnapSettings.IsEnabled` and `SnapSourceSettings.IsEnabled` to true for the `SnapSource` of interest.
-6. Start the geometry editor with a `GeometryType`.
+6. Toggle geometry guides using `SnapSettings.IsGeometryGuidesEnabled` and feature snapping using `SnapSettings.IsFeatureSnappingEnabled`.
+7. Start the geometry editor with a `GeometryType`.
 
 ## Relevant API
 
@@ -57,6 +58,10 @@ To snap to polygon and polyline layers, the recommended approach is to set the `
 
 Snapping can be used during interactive edits that move existing vertices using the `VertexTool` or `ReticleVertexTool`. It is also supported for adding new vertices for input devices with a hover event (such as a mouse move without a mouse button press). Using the `ReticleVertexTool` to add and move vertices allows users of touch screen devices to clearly see the visual cues for snapping.
 
+Geometry guides are enabled by default when snapping is enabled. These allow for snapping to a point coinciding with, parallel to, perpendicular to or extending an existing geometry.
+
+On supported platforms haptic feedback on `SnapState.SnappedToFeature` and `SnapState.SnappedToGeometryGuide` is enabled by default when snapping is enabled. Custom haptic feedback can be configured by setting `SnapSettings.IsHapticFeedbackEnabled` to false and listening to `GeometryEditor.SnapChanged` events to provide specific feedback depending on the `SnapState`.
+
 ## Tags
 
 edit, feature, geometry editor, graphics, layers, map, snapping
diff --git a/src/MAUI/Maui.Samples/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs b/src/MAUI/Maui.Samples/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
index 0ce6d0a307..e1041e7550 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
@@ -103,7 +103,7 @@ private async Task SetServiceFeatureTableFeatureLayer()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs b/src/MAUI/Maui.Samples/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
index af71ca82fa..dba9d24671 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
@@ -50,7 +50,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs b/src/MAUI/Maui.Samples/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
index e78bda7133..c34a9dcaaf 100644
--- a/src/MAUI/Maui.Samples/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
@@ -73,11 +73,7 @@ private async Task Initialize()
             _sceneLayerExtentPolygon = builder.ToGeometry();
 
             // Create the SceneLayerPolygonFilter to later apply to the OSM buildings layer.
-            _sceneLayerPolygonFilter = new SceneLayerPolygonFilter()
-            {
-                SpatialRelationship = SceneLayerPolygonFilterSpatialRelationship.Disjoint
-            };
-            _sceneLayerPolygonFilter.Polygons.Add(builder.ToGeometry());
+            _sceneLayerPolygonFilter = new SceneLayerPolygonFilter(new List<Polygon>() { builder.ToGeometry() }, SceneLayerPolygonFilterSpatialRelationship.Disjoint);
 
             // Create the extent graphic so we can add it later with the detailed buildings scene layer.
             var simpleLineSymbol = new SimpleLineSymbol(SimpleLineSymbolStyle.Solid, System.Drawing.Color.Red, 5.0f);
diff --git a/src/MAUI/Maui.Samples/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs b/src/MAUI/Maui.Samples/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
index bfecba6efe..56d7e53504 100644
--- a/src/MAUI/Maui.Samples/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
@@ -121,11 +121,10 @@ private async void LoginInfoEntered(object sender, LoginEventArgs e)
                 CredentialRequestInfo requestInfo = (CredentialRequestInfo)_loginTaskCompletionSrc.Task.AsyncState;
 
                 // Create a token credential using the provided username and password.
-                TokenCredential userCredentials = await AuthenticationManager.Current.GenerateCredentialAsync
+                AccessTokenCredential userCredentials = await AccessTokenCredential.CreateAsync
                                             (requestInfo.ServiceUri,
                                              e.Username,
-                                             e.Password,
-                                             requestInfo.GenerateTokenOptions);
+                                             e.Password);
 
                 // Set the task completion source result with the ArcGIS network credential.
                 // AuthenticationManager is waiting for this result and will add it to its Credentials collection.
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
index 3e869b4ace..5e2aab1283 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
@@ -57,7 +57,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
index eae339c517..a3e0509754 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
@@ -79,7 +79,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "editor01";
                     string sampleServer7Pass = "S7#i2LWmYH75";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
index 9f4d8072c0..d4d56bb672 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
@@ -60,7 +60,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
index 3b3cc9a89c..703d5f1b61 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
@@ -53,7 +53,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
index f68c107b2d..0882fd2204 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
@@ -66,7 +66,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
index 40221ff5e1..82dcc421a6 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
@@ -64,7 +64,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
index b9e5aa8e95..5fef5581ae 100644
--- a/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
@@ -110,9 +110,7 @@ private async Task Initialize()
                     "https://sampleserver7.arcgisonline.com/portal/sharing/rest";
                 string sampleServer7User = "editor01";
                 string sampleServer7Pass = "S7#i2LWmYH75";
-                var credential = await AuthenticationManager
-                    .Current
-                    .GenerateCredentialAsync(
+                var credential = await AccessTokenCredential.CreateAsync(
                         new Uri(sampleServerPortalUrl),
                         sampleServer7User,
                         sampleServer7Pass
diff --git a/src/WPF/WPF.Viewer/Helpers/ArcGISLoginPrompt.cs b/src/WPF/WPF.Viewer/Helpers/ArcGISLoginPrompt.cs
index 55401bf810..e4b0c1e36a 100644
--- a/src/WPF/WPF.Viewer/Helpers/ArcGISLoginPrompt.cs
+++ b/src/WPF/WPF.Viewer/Helpers/ArcGISLoginPrompt.cs
@@ -67,24 +67,6 @@ public static async Task<bool> EnsureAGOLCredentialAsync()
             return loggedIn;
         }
 
-        // ChallengeHandler function that will be called whenever access to a secured resource is attempted
-        public static async Task<Credential> PromptCredentialAsync(CredentialRequestInfo info)
-        {
-            Credential credential = null;
-
-            try
-            {
-                // IOAuthAuthorizeHandler will challenge the user for OAuth credentials
-                credential = await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri);
-            }
-            catch (OperationCanceledException)
-            {
-                // OAuth login was canceled, no need to display error to user.
-            }
-
-            return credential;
-        }
-
         public static void SetChallengeHandler()
         {
             var userConfig = new OAuthUserConfiguration(new Uri(ArcGISOnlineUrl), AppClientId, new Uri(OAuthRedirectUrl));
diff --git a/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs b/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
index 03b997e09e..f287e3f7e0 100644
--- a/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
@@ -54,7 +54,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "editor01";
                     string sampleServer7Pass = "S7#i2LWmYH75";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.jpg b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.jpg
index 8e9af3029b..8281327aa0 100644
Binary files a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.jpg and b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.jpg differ
diff --git a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
index 70cd1a3868..78c583fe68 100644
--- a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
+++ b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
@@ -44,109 +44,162 @@
                 VerticalAlignment="Top"
                 Background="White"
                 Visibility="Collapsed">
-            <StackPanel Margin="10" Orientation="Vertical">
-                <TextBlock Padding="0,5"
-                           FontSize="14"
-                           FontWeight="Bold"
-                           Text="Select snap sources" />
-                <TextBlock Text="Point layers:" />
-                <ListView x:Name="PointSnapSettingsList"
-                          Width="200"
-                          Height="80"
-                          ItemTemplate="{StaticResource SnapSettingTemplate}" />
-                <Button Click="EnableAllPointSnapSourceButton_Click" Content="Enable all" />
-                <TextBlock Margin="0,10,0,0" Text="Polyline layers:" />
-                <ListView x:Name="PolylineSnapSettingsList"
-                          Width="200"
-                          Height="50"
-                          ItemTemplate="{StaticResource SnapSettingTemplate}" />
-                <Button Click="EnableAllPolylineSnapSourceButton_Click" Content="Enable all" />
-                <TextBlock Margin="0,10,0,0" Text="Graphics overlays:" />
-                <ListView x:Name="GraphicsOverlaySnapSettingsList"
-                          Width="200"
-                          Height="30"
-                          BorderThickness="0"
-                          ItemTemplate="{StaticResource SnapSettingTemplate}" />
-                <TextBlock Padding="0,10,0,5"
-                           FontSize="14"
-                           FontWeight="Bold"
-                           Text="Create and edit geometries" />
-                <CheckBox x:Name="ReticleVertexToolCheckBox"
-                          Margin="5"
-                          Checked="ReticleVertexToolCheckBox_CheckedChanged"
-                          Content="Reticle vertex tool"
-                          Unchecked="ReticleVertexToolCheckBox_CheckedChanged" />
-                <Grid Width="200">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100" />
-                        <ColumnDefinition Width="100" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                    </Grid.RowDefinitions>
-                    <ToggleButton x:Name="PointButton"
-                                  Grid.Row="0"
-                                  Grid.Column="0"
-                                  Click="PointButton_Click"
-                                  Content="&#xe21c;"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Point" />
-                    <ToggleButton x:Name="MultipointButton"
-                                  Grid.Row="0"
-                                  Grid.Column="1"
-                                  Click="MultipointButton_Click"
-                                  Content="&#xe21c;&#xe21c;"
-                                  FontSize="20"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Multipoint" />
-                    <ToggleButton x:Name="PolylineButton"
-                                  Grid.Row="1"
-                                  Grid.Column="0"
-                                  Click="PolylineButton_Click"
-                                  Content="&#xe1a8;"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Polyline / no shape fill" />
-                    <ToggleButton x:Name="PolygonButton"
-                                  Grid.Row="1"
-                                  Grid.Column="1"
-                                  Click="PolygonButton_Click"
-                                  Content="&#xe220;"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Polygon / shape fill" />
-                    <Button Grid.Row="2"
-                            Grid.Column="0"
-                            HorizontalAlignment="Stretch"
-                            Click="DeleteButton_Click"
-                            Content="&#xe0e8;"
-                            IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, ElementName=MyMapView, FallbackValue=False}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Delete selected" />
-                    <Button Grid.Row="2"
-                            Grid.Column="1"
-                            Click="UndoButton_Click"
-                            Content="&#xe2d6;"
-                            IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Undo" />
-                    <Button Grid.Row="3"
-                            Grid.Column="0"
-                            Click="DiscardButton_Click"
-                            Content="&#xe080;"
-                            IsEnabled="{Binding GeometryEditor.IsStarted, ElementName=MyMapView}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Discard edits" />
-                    <Button Grid.Row="3"
-                            Grid.Column="1"
-                            Click="SaveButton_Click"
-                            Content="&#xe06f;"
-                            IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Save edits" />
-                </Grid>
-            </StackPanel>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <ScrollViewer Grid.Row="0" Height="300">
+                    <StackPanel Margin="10" Orientation="Vertical">
+                        <TextBlock Padding="0,5"
+                                   FontSize="14"
+                                   FontWeight="Bold"
+                                   Text="Snap settings" />
+                        <ListView Width="200" Height="80">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Column="0"
+                                           Width="150"
+                                           Text="Snapping enabled" />
+                                <CheckBox Grid.Column="1" IsChecked="{Binding GeometryEditor.SnapSettings.IsEnabled, ElementName=MyMapView}" />
+                            </Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Column="0"
+                                           Width="150"
+                                           Text="Geometry guides" />
+                                <CheckBox Grid.Column="1"
+                                          IsChecked="{Binding GeometryEditor.SnapSettings.IsGeometryGuidesEnabled, ElementName=MyMapView}"
+                                          IsEnabled="{Binding GeometryEditor.SnapSettings.IsEnabled, ElementName=MyMapView}" />
+                            </Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Column="0"
+                                           Width="150"
+                                           Text="Feature snapping" />
+                                <CheckBox Grid.Column="1"
+                                          IsChecked="{Binding GeometryEditor.SnapSettings.IsFeatureSnappingEnabled, ElementName=MyMapView}"
+                                          IsEnabled="{Binding GeometryEditor.SnapSettings.IsEnabled, ElementName=MyMapView}" />
+                            </Grid>
+                        </ListView>
+                        <Button Click="EnableAllSnapSettingsButton_Click" Content="Enable all" />
+                        <TextBlock Padding="0,5"
+                                   FontSize="14"
+                                   FontWeight="Bold"
+                                   Text="Select snap sources" />
+                        <TextBlock Text="Point layers:" />
+                        <ListView x:Name="PointSnapSettingsList"
+                                  Width="200"
+                                  Height="80"
+                                  ItemTemplate="{StaticResource SnapSettingTemplate}" />
+                        <Button Click="EnableAllPointSnapSourceButton_Click" Content="Enable all" />
+                        <TextBlock Margin="0,10,0,0" Text="Polyline layers:" />
+                        <ListView x:Name="PolylineSnapSettingsList"
+                                  Width="200"
+                                  Height="50"
+                                  ItemTemplate="{StaticResource SnapSettingTemplate}" />
+                        <Button Click="EnableAllPolylineSnapSourceButton_Click" Content="Enable all" />
+                        <TextBlock Margin="0,10,0,0" Text="Graphics overlays:" />
+                        <ListView x:Name="GraphicsOverlaySnapSettingsList"
+                                  Width="200"
+                                  Height="30"
+                                  BorderThickness="0"
+                                  ItemTemplate="{StaticResource SnapSettingTemplate}" />
+                    </StackPanel>
+                </ScrollViewer>
+                <StackPanel Grid.Row="1"
+                            Margin="10"
+                            Orientation="Vertical">
+                    <TextBlock Padding="0,10,0,5"
+                               FontSize="14"
+                               FontWeight="Bold"
+                               Text="Create and edit geometries" />
+                    <CheckBox x:Name="ReticleVertexToolCheckBox"
+                              Margin="5"
+                              Checked="ReticleVertexToolCheckBox_CheckedChanged"
+                              Content="Reticle vertex tool"
+                              Unchecked="ReticleVertexToolCheckBox_CheckedChanged" />
+                    <Grid Width="200">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="100" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                        </Grid.RowDefinitions>
+                        <ToggleButton x:Name="PointButton"
+                                      Grid.Row="0"
+                                      Grid.Column="0"
+                                      Click="PointButton_Click"
+                                      Content="&#xe21c;"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Point" />
+                        <ToggleButton x:Name="MultipointButton"
+                                      Grid.Row="0"
+                                      Grid.Column="1"
+                                      Click="MultipointButton_Click"
+                                      Content="&#xe21c;&#xe21c;"
+                                      FontSize="20"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Multipoint" />
+                        <ToggleButton x:Name="PolylineButton"
+                                      Grid.Row="1"
+                                      Grid.Column="0"
+                                      Click="PolylineButton_Click"
+                                      Content="&#xe1a8;"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Polyline / no shape fill" />
+                        <ToggleButton x:Name="PolygonButton"
+                                      Grid.Row="1"
+                                      Grid.Column="1"
+                                      Click="PolygonButton_Click"
+                                      Content="&#xe220;"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Polygon / shape fill" />
+                        <Button Grid.Row="2"
+                                Grid.Column="0"
+                                HorizontalAlignment="Stretch"
+                                Click="DeleteButton_Click"
+                                Content="&#xe0e8;"
+                                IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, ElementName=MyMapView, FallbackValue=False}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Delete selected" />
+                        <Button Grid.Row="2"
+                                Grid.Column="1"
+                                Click="UndoButton_Click"
+                                Content="&#xe2d6;"
+                                IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Undo" />
+                        <Button Grid.Row="3"
+                                Grid.Column="0"
+                                Click="DiscardButton_Click"
+                                Content="&#xe080;"
+                                IsEnabled="{Binding GeometryEditor.IsStarted, ElementName=MyMapView}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Discard edits" />
+                        <Button Grid.Row="3"
+                                Grid.Column="1"
+                                Click="SaveButton_Click"
+                                Content="&#xe06f;"
+                                IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Save edits" />
+                    </Grid>
+                </StackPanel>
+            </Grid>
         </Border>
     </Grid>
 </UserControl>
diff --git a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
index 7324fcddff..8a8ca5a1db 100644
--- a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
@@ -206,7 +206,15 @@ private void ResetFromEditingSession()
             _selectedGraphic = null;
         }
 
-        #region Enable Sources Button Handlers
+        #region Enable Snapping Button Handlers
+        // Enable all snap settings.
+        private void EnableAllSnapSettingsButton_Click(object sender, RoutedEventArgs e)
+        {
+            _geometryEditor.SnapSettings.IsEnabled = true;
+            _geometryEditor.SnapSettings.IsGeometryGuidesEnabled = true;
+            _geometryEditor.SnapSettings.IsFeatureSnappingEnabled = true;
+        }
+
         // Enable all point layer snap sources.
         private void EnableAllPointSnapSourceButton_Click(object sender, RoutedEventArgs e)
         {
diff --git a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md
index 87c86309b8..6b10270ee7 100644
--- a/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md
+++ b/src/WPF/WPF.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md
@@ -12,7 +12,7 @@ A field worker can create new features by editing and snapping the vertices of a
 
 To create a geometry, press the create button to choose the geometry type you want to create (i.e. points, multipoints, polyline, or polygon) and interactively tap and drag on the map view to create the geometry.
 
-To configure snapping, press the snap settings button to enable or disable snapping and choose which snap sources to snap to.
+Snap settings can be configured by enabling and disabling snapping, feature snapping, geometry guides and snap sources.
 
 To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source and move the mouse pointer or drag a vertex to nearby an existing feature or graphic. When the pointer is close to that existing geoelement, the edit position will be adjusted to coincide with (or snap to), edges and vertices of its geometry. Click or release the touch pointer to place the vertex at the snapped location.
 
@@ -31,7 +31,8 @@ To save your edits, press the save button.
 3. Create a `GeometryEditor` and connect it to the map view.
 4. Call `SyncSourceSettings` after the map's operational layers are loaded and the geometry editor has connected to the map view.
 5. Set `SnapSettings.IsEnabled` and `SnapSourceSettings.IsEnabled` to true for the `SnapSource` of interest.
-6. Start the geometry editor with a `GeometryType`.
+6. Toggle geometry guides using `SnapSettings.IsGeometryGuidesEnabled` and feature snapping using `SnapSettings.IsFeatureSnappingEnabled`.
+7. Start the geometry editor with a `GeometryType`.
 
 ## Relevant API
 
@@ -57,6 +58,10 @@ To snap to polygon and polyline layers, the recommended approach is to set the `
 
 Snapping can be used during interactive edits that move existing vertices using the `VertexTool` or `ReticleVertexTool`. It is also supported for adding new vertices for input devices with a hover event (such as a mouse move without a mouse button press). Using the `ReticleVertexTool` to add and move vertices allows users of touch screen devices to clearly see the visual cues for snapping.
 
+Geometry guides are enabled by default when snapping is enabled. These allow for snapping to a point coinciding with, parallel to, perpendicular to or extending an existing geometry.
+
+On supported platforms haptic feedback on `SnapState.SnappedToFeature` and `SnapState.SnappedToGeometryGuide` is enabled by default when snapping is enabled. Custom haptic feedback can be configured by setting `SnapSettings.IsHapticFeedbackEnabled` to false and listening to `GeometryEditor.SnapChanged` events to provide specific feedback depending on the `SnapState`.
+
 ## Tags
 
 edit, feature, geometry editor, graphics, layers, map, snapping
diff --git a/src/WPF/WPF.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs b/src/WPF/WPF.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
index 6ef422f4ce..1c2476583f 100644
--- a/src/WPF/WPF.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
@@ -107,7 +107,7 @@ private async Task SetServiceFeatureTableFeatureLayer()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs b/src/WPF/WPF.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
index 7f46473ae9..216759ac6a 100644
--- a/src/WPF/WPF.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
@@ -52,7 +52,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs b/src/WPF/WPF.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
index 0422b99cd6..b782d0ae1a 100644
--- a/src/WPF/WPF.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
@@ -12,6 +12,7 @@
 using Esri.ArcGISRuntime.Symbology;
 using Esri.ArcGISRuntime.UI;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -76,11 +77,7 @@ private async Task Initialize()
             _sceneLayerExtentPolygon = builder.ToGeometry();
 
             // Create the SceneLayerPolygonFilter to later apply to the OSM buildings layer.
-            _sceneLayerPolygonFilter = new SceneLayerPolygonFilter()
-            {
-                SpatialRelationship = SceneLayerPolygonFilterSpatialRelationship.Disjoint
-            };
-            _sceneLayerPolygonFilter.Polygons.Add(builder.ToGeometry());
+            _sceneLayerPolygonFilter = new SceneLayerPolygonFilter(new List<Polygon>() { builder.ToGeometry() }, SceneLayerPolygonFilterSpatialRelationship.Disjoint);
 
             // Create the extent graphic so we can add it later with the detailed buildings scene layer.
             var simpleLineSymbol = new SimpleLineSymbol(SimpleLineSymbolStyle.Solid, System.Drawing.Color.Red, 5.0f);
diff --git a/src/WPF/WPF.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs b/src/WPF/WPF.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
index e8347cb905..27493e626f 100644
--- a/src/WPF/WPF.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
@@ -96,11 +96,10 @@ private async void LoginButtonClick(object sender, RoutedEventArgs e)
             try
             {
                 // Create a token credential using the provided username and password.
-                TokenCredential userCredentials = await AuthenticationManager.Current.GenerateCredentialAsync
+                AccessTokenCredential userCredentials = await AccessTokenCredential.CreateAsync
                                             (new Uri(loginEntry.ServiceUrl),
                                              loginEntry.UserName,
-                                             loginEntry.Password,
-                                             loginEntry.RequestInfo.GenerateTokenOptions);
+                                             loginEntry.Password);
 
                 // Set the result on the task completion source.
                 _loginTaskCompletionSource.TrySetResult(userCredentials);
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
index b8a4b1eb69..6662cc93d2 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
@@ -67,7 +67,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
index 73226c14aa..e6333106c8 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
@@ -84,7 +84,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "editor01";
                     string sampleServer7Pass = "S7#i2LWmYH75";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
index 106ef7f913..b42c35aa82 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
@@ -64,7 +64,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
index 54ed09eefe..55439ecbc6 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
@@ -58,7 +58,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
index ec8e5a0ec5..44c532cad6 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
@@ -72,7 +72,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
index 4502d33fd9..191883ac75 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
@@ -73,7 +73,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
index 98d28d0e6f..2f0144885b 100644
--- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
@@ -114,9 +114,7 @@ private async Task Initialize()
                     "https://sampleserver7.arcgisonline.com/portal/sharing/rest";
                 string sampleServer7User = "editor01";
                 string sampleServer7Pass = "S7#i2LWmYH75";
-                var credential = await AuthenticationManager
-                    .Current
-                    .GenerateCredentialAsync(
+                var credential = await AccessTokenCredential.CreateAsync(
                         new Uri(sampleServerPortalUrl),
                         sampleServer7User,
                         sampleServer7Pass
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Helpers/ArcGISLoginPrompt.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Helpers/ArcGISLoginPrompt.cs
index 01342c6314..c5dc79765e 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Helpers/ArcGISLoginPrompt.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Helpers/ArcGISLoginPrompt.cs
@@ -68,24 +68,6 @@ public static async Task<bool> EnsureAGOLCredentialAsync()
             return loggedIn;
         }
 
-        // ChallengeHandler function that will be called whenever access to a secured resource is attempted
-        public static async Task<Credential> PromptCredentialAsync(CredentialRequestInfo info)
-        {
-            Credential credential = null;
-
-            try
-            {
-                // IOAuthAuthorizeHandler will challenge the user for OAuth credentials
-                credential = await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri);
-            }
-            catch (OperationCanceledException)
-            {
-                // OAuth login was canceled, no need to display error to user.
-            }
-
-            return credential;
-        }
-
         public static void SetChallengeHandler(UserControl sample)
         {
             var userConfig = new OAuthUserConfiguration(new Uri(ArcGISOnlineUrl), AppClientId, new Uri(OAuthRedirectUrl));
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
index 4aade2297f..3c8e3ea27d 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
@@ -55,7 +55,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "editor01";
                     string sampleServer7Pass = "S7#i2LWmYH75";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
index 86dd7fd400..130784a6f4 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml
@@ -45,13 +45,67 @@
                 Background="White"
                 CornerRadius="5"
                 Visibility="Collapsed">
-            <StackPanel Margin="10" Orientation="Vertical">
-                <TextBlock Padding="0,5"
-                           FontSize="14"
-                           FontWeight="Bold"
-                           Text="Select snap sources" />
-                <ScrollView MaxHeight="300">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <ScrollView Grid.Row="0" MaxHeight="300">
                     <StackPanel Margin="10" Orientation="Vertical">
+                        <TextBlock Padding="0,5"
+                                   FontSize="14"
+                                   FontWeight="Bold"
+                                   Text="Snap settings" />
+                        <ListView Width="200" Height="120">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Column="0"
+                                           Width="150"
+                                           VerticalAlignment="Center"
+                                           Text="Snapping Enabled" />
+                                <CheckBox Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          IsChecked="{Binding GeometryEditor.SnapSettings.IsEnabled, ElementName=MyMapView, Mode=TwoWay}" />
+                            </Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Column="0"
+                                           Width="150"
+                                           VerticalAlignment="Center"
+                                           Text="Geometry guides" />
+                                <CheckBox Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          IsChecked="{Binding GeometryEditor.SnapSettings.IsGeometryGuidesEnabled, ElementName=MyMapView, Mode=TwoWay}"
+                                          IsEnabled="{Binding GeometryEditor.SnapSettings.IsEnabled, ElementName=MyMapView}" />
+                            </Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Grid.Column="0"
+                                           Width="150"
+                                           VerticalAlignment="Center"
+                                           Text="Feature snapping" />
+                                <CheckBox Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          IsChecked="{Binding GeometryEditor.SnapSettings.IsFeatureSnappingEnabled, ElementName=MyMapView, Mode=TwoWay}"
+                                          IsEnabled="{Binding GeometryEditor.SnapSettings.IsEnabled, ElementName=MyMapView}" />
+                            </Grid>
+                        </ListView>
+                        <Button HorizontalAlignment="Stretch"
+                                Click="EnableAllSnapSettingsButton_Click"
+                                Content="Enable all" />
+                        <TextBlock Padding="0,5"
+                                   FontSize="14"
+                                   FontWeight="Bold"
+                                   Text="Select snap sources" />
                         <TextBlock Text="Point layers:" />
                         <ListView x:Name="PointSnapSettingsList"
                                   Width="200"
@@ -75,99 +129,103 @@
                                   ItemTemplate="{StaticResource SnapSettingTemplate}" />
                     </StackPanel>
                 </ScrollView>
-                <TextBlock Padding="0,10,0,5"
-                           FontSize="14"
-                           FontWeight="Bold"
-                           Text="Create and edit geometries" />
-                <Grid Width="200" HorizontalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="150" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0"
-                               VerticalAlignment="Center"
-                               Text="Reticle vertex tool" />
-                    <CheckBox x:Name="ReticleVertexToolCheckBox"
-                              Grid.Column="1"
-                              VerticalAlignment="Center"
-                              Checked="ReticleVertexToolCheckBox_CheckedChanged"
-                              Unchecked="ReticleVertexToolCheckBox_CheckedChanged" />
-                </Grid>
-                <Grid Width="200"
-                      HorizontalAlignment="Center"
-                      ColumnSpacing="5"
-                      RowSpacing="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="95" />
-                        <ColumnDefinition Width="95" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                        <RowDefinition Height="auto" />
-                    </Grid.RowDefinitions>
-                    <ToggleButton x:Name="PointButton"
-                                  Grid.Row="0"
-                                  Grid.Column="0"
-                                  Click="PointButton_Click"
-                                  Content="&#xe21c;"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Point" />
-                    <ToggleButton x:Name="MultipointButton"
-                                  Grid.Row="0"
+                <StackPanel Grid.Row="1"
+                            Margin="10"
+                            Orientation="Vertical">
+                    <TextBlock Padding="0,10,0,5"
+                               FontSize="14"
+                               FontWeight="Bold"
+                               Text="Create and edit geometries" />
+                    <Grid Width="200" HorizontalAlignment="Center">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Column="0"
+                                   VerticalAlignment="Center"
+                                   Text="Reticle vertex tool" />
+                        <CheckBox x:Name="ReticleVertexToolCheckBox"
                                   Grid.Column="1"
-                                  Height="{Binding ElementName=PointButton, Path=Height}"
-                                  Click="MultipointButton_Click"
-                                  Content="&#xe21c;&#xe21c;"
-                                  FontSize="20"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Multipoint" />
-                    <ToggleButton x:Name="PolylineButton"
-                                  Grid.Row="1"
-                                  Grid.Column="0"
-                                  Click="PolylineButton_Click"
-                                  Content="&#xe1a8;"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Polyline / no shape fill" />
-                    <ToggleButton x:Name="PolygonButton"
-                                  Grid.Row="1"
-                                  Grid.Column="1"
-                                  Click="PolygonButton_Click"
-                                  Content="&#xe220;"
-                                  Style="{StaticResource ToggleButtonIconStyle}"
-                                  ToolTipService.ToolTip="Polygon / shape fill" />
-                    <Button Grid.Row="2"
-                            Grid.Column="0"
-                            HorizontalAlignment="Stretch"
-                            Click="DeleteButton_Click"
-                            Content="&#xe0e8;"
-                            IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, ElementName=MyMapView, FallbackValue=False}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Delete selected" />
-                    <Button Grid.Row="2"
-                            Grid.Column="1"
-                            Click="UndoButton_Click"
-                            Content="&#xe2d6;"
-                            IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Undo" />
-                    <Button Grid.Row="3"
-                            Grid.Column="0"
-                            Click="DiscardButton_Click"
-                            Content="&#xe080;"
-                            IsEnabled="{Binding GeometryEditor.IsStarted, ElementName=MyMapView}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Discard edits" />
-                    <Button Grid.Row="3"
-                            Grid.Column="1"
-                            Click="SaveButton_Click"
-                            Content="&#xe06f;"
-                            IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
-                            Style="{StaticResource ButtonIconStyle}"
-                            ToolTipService.ToolTip="Save edits" />
-                </Grid>
-            </StackPanel>
+                                  VerticalAlignment="Center"
+                                  Checked="ReticleVertexToolCheckBox_CheckedChanged"
+                                  Unchecked="ReticleVertexToolCheckBox_CheckedChanged" />
+                    </Grid>
+                    <Grid Width="200"
+                          HorizontalAlignment="Center"
+                          ColumnSpacing="5"
+                          RowSpacing="5">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="95" />
+                            <ColumnDefinition Width="95" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                        </Grid.RowDefinitions>
+                        <ToggleButton x:Name="PointButton"
+                                      Grid.Row="0"
+                                      Grid.Column="0"
+                                      Click="PointButton_Click"
+                                      Content="&#xe21c;"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Point" />
+                        <ToggleButton x:Name="MultipointButton"
+                                      Grid.Row="0"
+                                      Grid.Column="1"
+                                      Height="{Binding ElementName=PointButton, Path=Height}"
+                                      Click="MultipointButton_Click"
+                                      Content="&#xe21c;&#xe21c;"
+                                      FontSize="20"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Multipoint" />
+                        <ToggleButton x:Name="PolylineButton"
+                                      Grid.Row="1"
+                                      Grid.Column="0"
+                                      Click="PolylineButton_Click"
+                                      Content="&#xe1a8;"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Polyline / no shape fill" />
+                        <ToggleButton x:Name="PolygonButton"
+                                      Grid.Row="1"
+                                      Grid.Column="1"
+                                      Click="PolygonButton_Click"
+                                      Content="&#xe220;"
+                                      Style="{StaticResource ToggleButtonIconStyle}"
+                                      ToolTipService.ToolTip="Polygon / shape fill" />
+                        <Button Grid.Row="2"
+                                Grid.Column="0"
+                                HorizontalAlignment="Stretch"
+                                Click="DeleteButton_Click"
+                                Content="&#xe0e8;"
+                                IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, ElementName=MyMapView, FallbackValue=False}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Delete selected" />
+                        <Button Grid.Row="2"
+                                Grid.Column="1"
+                                Click="UndoButton_Click"
+                                Content="&#xe2d6;"
+                                IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Undo" />
+                        <Button Grid.Row="3"
+                                Grid.Column="0"
+                                Click="DiscardButton_Click"
+                                Content="&#xe080;"
+                                IsEnabled="{Binding GeometryEditor.IsStarted, ElementName=MyMapView}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Discard edits" />
+                        <Button Grid.Row="3"
+                                Grid.Column="1"
+                                Click="SaveButton_Click"
+                                Content="&#xe06f;"
+                                IsEnabled="{Binding GeometryEditor.CanUndo, ElementName=MyMapView}"
+                                Style="{StaticResource ButtonIconStyle}"
+                                ToolTipService.ToolTip="Save edits" />
+                    </Grid>
+                </StackPanel>
+            </Grid>
         </Border>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
index b4a09b727c..dd81680874 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/SnapGeometryEdits.xaml.cs
@@ -208,7 +208,15 @@ private void ResetFromEditingSession()
             _selectedGraphic = null;
         }
 
-        #region Enable Sources Button Handlers
+        #region Enable Snapping Button Handlers
+        // Enable all snap settings.
+        private void EnableAllSnapSettingsButton_Click(object sender, RoutedEventArgs e)
+        {
+            _geometryEditor.SnapSettings.IsEnabled = true;
+            _geometryEditor.SnapSettings.IsGeometryGuidesEnabled = true;
+            _geometryEditor.SnapSettings.IsFeatureSnappingEnabled = true;
+        }
+
         // Enable all point layer snap sources.
         private void EnableAllPointSnapSourceButton_Click(object sender, RoutedEventArgs e)
         {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md
index 87c86309b8..6b10270ee7 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Geometry/SnapGeometryEdits/readme.md
@@ -12,7 +12,7 @@ A field worker can create new features by editing and snapping the vertices of a
 
 To create a geometry, press the create button to choose the geometry type you want to create (i.e. points, multipoints, polyline, or polygon) and interactively tap and drag on the map view to create the geometry.
 
-To configure snapping, press the snap settings button to enable or disable snapping and choose which snap sources to snap to.
+Snap settings can be configured by enabling and disabling snapping, feature snapping, geometry guides and snap sources.
 
 To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source and move the mouse pointer or drag a vertex to nearby an existing feature or graphic. When the pointer is close to that existing geoelement, the edit position will be adjusted to coincide with (or snap to), edges and vertices of its geometry. Click or release the touch pointer to place the vertex at the snapped location.
 
@@ -31,7 +31,8 @@ To save your edits, press the save button.
 3. Create a `GeometryEditor` and connect it to the map view.
 4. Call `SyncSourceSettings` after the map's operational layers are loaded and the geometry editor has connected to the map view.
 5. Set `SnapSettings.IsEnabled` and `SnapSourceSettings.IsEnabled` to true for the `SnapSource` of interest.
-6. Start the geometry editor with a `GeometryType`.
+6. Toggle geometry guides using `SnapSettings.IsGeometryGuidesEnabled` and feature snapping using `SnapSettings.IsFeatureSnappingEnabled`.
+7. Start the geometry editor with a `GeometryType`.
 
 ## Relevant API
 
@@ -57,6 +58,10 @@ To snap to polygon and polyline layers, the recommended approach is to set the `
 
 Snapping can be used during interactive edits that move existing vertices using the `VertexTool` or `ReticleVertexTool`. It is also supported for adding new vertices for input devices with a hover event (such as a mouse move without a mouse button press). Using the `ReticleVertexTool` to add and move vertices allows users of touch screen devices to clearly see the visual cues for snapping.
 
+Geometry guides are enabled by default when snapping is enabled. These allow for snapping to a point coinciding with, parallel to, perpendicular to or extending an existing geometry.
+
+On supported platforms haptic feedback on `SnapState.SnappedToFeature` and `SnapState.SnappedToGeometryGuide` is enabled by default when snapping is enabled. Custom haptic feedback can be configured by setting `SnapSettings.IsHapticFeedbackEnabled` to false and listening to `GeometryEditor.SnapChanged` events to provide specific feedback depending on the `SnapState`.
+
 ## Tags
 
 edit, feature, geometry editor, graphics, layers, map, snapping
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
index 054b6736d7..7094ddf37c 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.xaml.cs
@@ -107,7 +107,7 @@ private async Task SetServiceFeatureTableFeatureLayer()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
index fe59965021..48bb24cf08 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.xaml.cs
@@ -51,7 +51,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
index cf9194121e..cebb06bc73 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Scene/FilterFeaturesInScene/FilterFeaturesInScene.xaml.cs
@@ -13,6 +13,7 @@
 using Esri.ArcGISRuntime.UI;
 using Microsoft.UI.Xaml;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Geometry = Esri.ArcGISRuntime.Geometry.Geometry;
@@ -76,11 +77,7 @@ private async Task Initialize()
             _sceneLayerExtentPolygon = builder.ToGeometry();
 
             // Create the SceneLayerPolygonFilter to later apply to the OSM buildings layer.
-            _sceneLayerPolygonFilter = new SceneLayerPolygonFilter()
-            {
-                SpatialRelationship = SceneLayerPolygonFilterSpatialRelationship.Disjoint
-            };
-            _sceneLayerPolygonFilter.Polygons.Add(builder.ToGeometry());
+            _sceneLayerPolygonFilter = new SceneLayerPolygonFilter(new List<Polygon>() { builder.ToGeometry() }, SceneLayerPolygonFilterSpatialRelationship.Disjoint);
 
             // Create the extent graphic so we can add it later with the detailed buildings scene layer.
             var simpleLineSymbol = new SimpleLineSymbol(SimpleLineSymbolStyle.Solid, System.Drawing.Color.Red, 5.0f);
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
index b94b0cbc78..d04f993a8d 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Security/TokenSecuredChallenge/TokenSecuredChallenge.xaml.cs
@@ -157,11 +157,10 @@ private async void LoginButtonClick(object sender, RoutedEventArgs e)
             try
             {
                 // Create a token credential using the provided username and password.
-                TokenCredential userCredentials = await AuthenticationManager.Current.GenerateCredentialAsync
+                Credential userCredentials = await AccessTokenCredential.CreateAsync
                                             (new Uri(loginEntry.ServiceUrl),
                                              loginEntry.UserName,
-                                             loginEntry.Password,
-                                             loginEntry.RequestInfo.GenerateTokenOptions);
+                                             loginEntry.Password);
 
                 // Set the result on the task completion source.
                 _loginTaskCompletionSource.TrySetResult(userCredentials);
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
index a5bfdf3313..30cd24b3f3 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs
@@ -66,7 +66,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
index 5c54704a13..63eabec18b 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/CreateLoadReport/CreateLoadReport.xaml.cs
@@ -84,7 +84,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "editor01";
                     string sampleServer7Pass = "S7#i2LWmYH75";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
index 09ee5a22f7..d30eec1402 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.xaml.cs
@@ -63,7 +63,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
index edf34bb7c7..0788503abd 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/DisplayUtilityNetworkContainer/DisplayUtilityNetworkContainer.xaml.cs
@@ -59,7 +59,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
index 7f4a3aa0c8..ec92e88e71 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs
@@ -72,7 +72,7 @@ private async Task Initialize()
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
 
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
index a6ab816fee..4314d3c86c 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.xaml.cs
@@ -72,7 +72,7 @@ private async Task Initialize()
                     // WARNING: Never hardcode login information in a production application. This is done solely for the sake of the sample.
                     string sampleServer7User = "viewer01";
                     string sampleServer7Pass = "I68VGU^nMurF";
-                    return await AuthenticationManager.Current.GenerateCredentialAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
+                    return await AccessTokenCredential.CreateAsync(info.ServiceUri, sampleServer7User, sampleServer7Pass);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
index e43bd837d5..eb86b23d36 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.xaml.cs
@@ -114,9 +114,7 @@ private async Task Initialize()
                     "https://sampleserver7.arcgisonline.com/portal/sharing/rest";
                 string sampleServer7User = "editor01";
                 string sampleServer7Pass = "S7#i2LWmYH75";
-                var credential = await AuthenticationManager
-                    .Current
-                    .GenerateCredentialAsync(
+                var credential = await AccessTokenCredential.CreateAsync(
                         new Uri(sampleServerPortalUrl),
                         sampleServer7User,
                         sampleServer7Pass
diff --git a/tools/GenerateApps.msbuild b/tools/GenerateApps.msbuild
index bc07897cbd..10bc1893e1 100644
--- a/tools/GenerateApps.msbuild
+++ b/tools/GenerateApps.msbuild
@@ -5,7 +5,7 @@
     <_NetWindowsTarget>net8.0-windows10.0.19041.0</_NetWindowsTarget>
     <_NetAndroidTarget>net8.0-android</_NetAndroidTarget>
     <Configuration Condition="'$(Configuration)'==''">Release</Configuration>
-    <RELEASE_VERSION Condition="'$(RELEASE_VERSION)'==''">200.5.0</RELEASE_VERSION>
+    <RELEASE_VERSION Condition="'$(RELEASE_VERSION)'==''">200.6.0</RELEASE_VERSION>
     <BUILD_NUM Condition="'$(BUILD_NUM)'==''">0</BUILD_NUM>
     <ArcGISMapsSDKVersion>$(RELEASE_VERSION)</ArcGISMapsSDKVersion>
 
@@ -82,7 +82,8 @@
     <MSBuild Projects="@(MAUIProject)" Targets="Publish" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);RuntimeIdentifier=win10-x64;RuntimeIdentifierOverride=win10-x64;UseRidGraph=true;ApplicationDisplayVersion=$(RELEASE_VERSION);ApplicationVersion=$(BUILD_NUM);PackageCertificateKeyFile=$(PFXSignatureFile);PackageCertificatePassword=$(PFXSignaturePassword)" />
     <MSBuild Projects="@(MAUIProject)" Targets="Publish" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);RuntimeIdentifier=win10-x86;RuntimeIdentifierOverride=win10-x86;UseRidGraph=true;ApplicationDisplayVersion=$(RELEASE_VERSION);ApplicationVersion=$(BUILD_NUM);PackageCertificateKeyFile=$(PFXSignatureFile);PackageCertificatePassword=$(PFXSignaturePassword)" />
     <MSBuild Projects="@(MAUIProject)" Targets="Publish" Properties="Configuration=$(Configuration);TargetFramework=$(_NetWindowsTarget);RuntimeIdentifier=win10-arm64;RuntimeIdentifierOverride=win10-arm64;UseRidGraph=true;ApplicationDisplayVersion=$(RELEASE_VERSION);ApplicationVersion=$(BUILD_NUM);PackageCertificateKeyFile=$(PFXSignatureFile);PackageCertificatePassword=$(PFXSignaturePassword)" />
-    <MSBuild Projects="@(MAUIProject)" Targets="Publish" Properties="Configuration=$(Configuration);TargetFramework=$(_NetAndroidTarget);ApplicationDisplayVersion=$(RELEASE_VERSION);ApplicationVersion=$(BUILD_NUM)" />
+    <MSBuild Projects="@(MAUIProject)" Targets="Publish" Properties="Configuration=$(Configuration);TargetFramework=$(_NetAndroidTarget);ApplicationDisplayVersion=$(RELEASE_VERSION);ApplicationVersion=$(BUILD_NUM);AndroidKeyStore=true;AndroidSigningKeyStore=$(KeyStoreFile);AndroidSigningKeyPass=$(KeyPass);AndroidSigningStorePass=$(KeyPass);AndroidSigningKeyAlias=$(KeyAlias)" />
+    
     <Copy SourceFiles="$(MSBuildThisFileDirectory)..\src\MAUI\Maui.Samples\bin\Release\net8.0-android\com.esri.arcgisruntime.samples.maui-Signed.apk"
           DestinationFolder="$(MSBuildThisFileDirectory)..\output\" />
     <Copy SourceFiles="$(MSBuildThisFileDirectory)..\src\MAUI\Maui.Samples\bin\Release\net8.0-android\com.esri.arcgisruntime.samples.maui-Signed.aab"
@@ -94,6 +95,6 @@
         <MakeDir Directories="$(MSBuildThisFileDirectory)..\output" />
     </Target>
 
-  <Target Name="BuildAll" DependsOnTargets="BuildWPF;BuildWinUI;BuildMaui;BuildUWP" />
+  <Target Name="BuildAll" DependsOnTargets="BuildWPF;BuildWinUI;BuildMaui" />
 
 </Project>
diff --git a/tools/cibuild.cmd b/tools/cibuild.cmd
index 02a23f4db5..296859d35a 100644
--- a/tools/cibuild.cmd
+++ b/tools/cibuild.cmd
@@ -12,7 +12,7 @@ IF "%VSINSTALLDIR%"=="" (
 )
 
 IF "%RELEASE_VERSION%" == "" (
-  SET RELEASE_VERSION=200.5.0
+  SET RELEASE_VERSION=200.6.0
 )
 
 REM Configure NuGet
@@ -55,5 +55,5 @@ IF "%ARCGIS_API_KEY%" NEQ "" (
 )
 
 
-msbuild /t:BuildAll %~dp0GenerateApps.msbuild /p:BUILD_NUM=%BUILD_NUM% /p:RELEASE_VERSION=%RELEASE_VERSION% /p:PUBLISHER="%PUBLISHER%" /p:PFXSignaturePassword=%PFXSignaturePassword% /p:PFXSignatureFile=%PFXSignatureFile% /p:PackageCertificateThumbprint=%PackageCertificateThumbprint%
+msbuild /t:BuildAll %~dp0GenerateApps.msbuild /p:BUILD_NUM=%BUILD_NUM% /p:RELEASE_VERSION=%RELEASE_VERSION% /p:PUBLISHER="%PUBLISHER%" /p:PFXSignaturePassword=%PFXSignaturePassword% /p:PFXSignatureFile=%PFXSignatureFile% /p:PackageCertificateThumbprint=%PackageCertificateThumbprint% /p:KeyStoreFile=%KeyStoreFile% /p:KeyPass=%KeyPass% /p:KeyAlias=%KeyAlias%