Updated MAUI bindings to use new Compiled Bindings introduced in .NET 9

src/Samples/Toolkit.SampleApp.Maui/Samples/BookmarksViewSample.xaml.cs

@@ -42,9 +42,7 @@ private void SetMapViewBinding_Click(object? sender, EventArgs e)
                 _viewContainer.Children.Add(MyMapView);
             if (_viewContainer.Children.Contains(MySceneView))
                 _viewContainer.Children.Remove(MySceneView);
-            Binding geoviewBinding = new Binding();
-            geoviewBinding.Source = MyMapView;
-            BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, geoviewBinding);
+            BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, static (MapView mapView) => mapView, source: MyMapView);
         }
 
         // Note that the Web Scene Specification does not use bookmarks.
@@ -55,9 +53,7 @@ private void SetSceneViewBinding_Click(object? sender, EventArgs e)
                 _viewContainer.Children.Add(MySceneView);
             if (_viewContainer.Children.Contains(MyMapView))
                 _viewContainer.Children.Remove(MyMapView);
-            Binding geoviewBinding = new Binding();
-            geoviewBinding.Source = MySceneView;
-            BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, geoviewBinding);
+            BookmarksView.SetBinding(Esri.ArcGISRuntime.Toolkit.Maui.BookmarksView.GeoViewProperty, static (SceneView sceneView) => sceneView, source: MySceneView);
         }
 
         private void SetDocumentOne_Click(object? sender, EventArgs e)

src/Samples/Toolkit.SampleApp.WinUI/Toolkit.SampleApp.WinUI.csproj

@@ -12,6 +12,7 @@
     <EnableMsixTooling>true</EnableMsixTooling>
     <DefineConstants>$(DefineConstants);WINUI</DefineConstants>
     <UseRidGraph>true</UseRidGraph>
+    <PublishAot>True</PublishAot>
   </PropertyGroup>
 
   <ItemGroup>

src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.DefaultTemplates.cs

@@ -15,7 +15,6 @@
 //  ******************************************************************************/
 
 using Esri.ArcGISRuntime.Mapping.Floor;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui;
 
@@ -27,11 +26,6 @@ public partial class FloorFilter
     private static readonly DataTemplate DefaultDifferentiatingFacilityDataTemplate;
     private static readonly ControlTemplate DefaultControlTemplate;
 
-
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorLevel.ShortName), "Esri.ArcGISRuntime.Mapping.Floor.FloorLevel", "Esri.ArcGISRuntime")]
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorFacility.Name), "Esri.ArcGISRuntime.Mapping.Floor.FloorFacility", "Esri.ArcGISRuntime")]
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorFacility.Site), "Esri.ArcGISRuntime.Mapping.Floor.FloorFacility", "Esri.ArcGISRuntime")]
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Floor.FloorSite.Name), "Esri.ArcGISRuntime.Mapping.Floor.FloorSite", "Esri.ArcGISRuntime")]
     static FloorFilter()
     {
         DefaultLevelDataTemplate = new DataTemplate(() =>
@@ -56,7 +50,7 @@ static FloorFilter()
                 VerticalOptions = LayoutOptions.Fill,
                 InputTransparent = false,
             };
-            textLabel.SetBinding(Label.TextProperty, "ShortName");
+            textLabel.SetBinding(Label.TextProperty, static (FloorLevel level) => level.ShortName);
             containingGrid.Children.Add(textLabel);
             return containingGrid;
         });
@@ -73,7 +67,7 @@ static FloorFilter()
                 Margin = new Thickness(8),
                 HorizontalOptions = LayoutOptions.Fill
             };
-            textLabel.SetBinding(Label.TextProperty, "Name");
+            textLabel.SetBinding(Label.TextProperty, static (FloorFacility facility) => facility.Name);
             textLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb("#6e6e6e"), Color.FromArgb("#fff"));
 
             containingGrid.Children.Add(textLabel);
@@ -111,7 +105,7 @@ static FloorFilter()
                 FontSize = 14,
             };
             titleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb("#6e6e6e"), Color.FromArgb("#fff"));
-            titleLabel.SetBinding(Label.TextProperty, "Name");
+            titleLabel.SetBinding(Label.TextProperty, static (FloorFacility facility) => facility.Name);
 
             Label subtitleLabel = new Label
             {
@@ -120,7 +114,7 @@ static FloorFilter()
                 VerticalOptions = LayoutOptions.Start,
             };
             subtitleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb("#2e2e2e"), Color.FromArgb("#aaa"));
-            subtitleLabel.SetBinding(Label.TextProperty, "Site.Name");
+            subtitleLabel.SetBinding(Label.TextProperty, static (FloorFacility facility) => facility.Site?.Name);
             textStack.Children.Add(titleLabel);
             textStack.Children.Add(subtitleLabel);
             Grid.SetRow(titleLabel, 0);

src/Toolkit/Toolkit.Maui/FloorFilter/FloorFilter.cs

@@ -125,8 +125,8 @@ protected override void OnApplyTemplate()
         {
             PART_LevelListView.ItemTemplate = LevelDataTemplate;
             PART_LevelListView.BindingContext = this;
-            PART_LevelListView.SetBinding(CollectionView.ItemsSourceProperty, new Binding(nameof(DisplayLevels), BindingMode.OneWay));
-            PART_LevelListView.SetBinding(CollectionView.SelectedItemProperty, new Binding(nameof(SelectedLevel), BindingMode.TwoWay));
+            PART_LevelListView.SetBinding(CollectionView.ItemsSourceProperty, nameof(DisplayLevels), BindingMode.OneWay);
+            PART_LevelListView.SetBinding(CollectionView.SelectedItemProperty, static (FloorFilter filter) => filter.SelectedLevel, BindingMode.TwoWay);
         }
     }
 

src/Toolkit/Toolkit.Maui/Legend/Legend.cs

@@ -15,7 +15,6 @@
 //  ******************************************************************************/
 
 using Esri.ArcGISRuntime.Mapping;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui;
 
@@ -29,36 +28,31 @@ public class Legend : TemplatedView
     private static DataTemplate s_DefaultSublayerItemTemplate;
     private static DataTemplate s_DefaultLegendInfoItemTemplate;
     private static ControlTemplate s_DefaultControlTemplate;
-
-
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.Layer.Name), "Esri.ArcGISRuntime.Mapping.Layer", "Esri.ArcGISRuntime")]
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.ILayerContent.Name), "Esri.ArcGISRuntime.Mapping.ILayerContent", "Esri.ArcGISRuntime")]
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.LegendInfo.Name), "Esri.ArcGISRuntime.Mapping.LegendInfo", "Esri.ArcGISRuntime")]
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.LegendInfo.Symbol), "Esri.ArcGISRuntime.Mapping.LegendInfo", "Esri.ArcGISRuntime")]
+
     static Legend()
     {
         s_DefaultLayerItemTemplate = new DataTemplate(() =>
         {
             var nameLabel = new Label { FontSize = 18, VerticalOptions = LayoutOptions.Center };
-            nameLabel.SetBinding(Label.TextProperty, $"{nameof(LegendEntry.Content)}.{nameof(Layer.Name)}");
+            nameLabel.SetBinding(Label.TextProperty, static (LegendEntry entry) => ((Layer)entry.Content).Name);
             return nameLabel;
         });
 
         s_DefaultSublayerItemTemplate = new DataTemplate(() =>
         {
             var nameLabel = new Label { FontSize = 14, VerticalOptions = LayoutOptions.Center };
-            nameLabel.SetBinding(Label.TextProperty, $"{nameof(LegendEntry.Content)}.{nameof(ILayerContent.Name)}");
+            nameLabel.SetBinding(Label.TextProperty, static (LegendEntry entry) => ((ILayerContent)entry.Content).Name);
             return nameLabel;
         });
 
         s_DefaultLegendInfoItemTemplate = new DataTemplate(() =>
         {
             StackLayout sl = new StackLayout() { Orientation = StackOrientation.Horizontal };
             var symbol = new SymbolDisplay { WidthRequest = 40, HeightRequest = 40, VerticalOptions = LayoutOptions.Center, Margin = new Thickness(0, 0, 5, 0) };
-            symbol.SetBinding(SymbolDisplay.SymbolProperty, $"{nameof(LegendEntry.Content)}.{nameof(LegendInfo.Symbol)}");
+            symbol.SetBinding(SymbolDisplay.SymbolProperty, static (LegendEntry entry) => ((LegendInfo)entry.Content).Symbol);
             sl.Children.Add(symbol);
             var nameLabel = new Label { FontSize = 12, VerticalOptions = LayoutOptions.Center };
-            nameLabel.SetBinding(Label.TextProperty, $"{nameof(LegendEntry.Content)}.{nameof(LegendInfo.Name)}");
+            nameLabel.SetBinding(Label.TextProperty, static (LegendEntry entry) => ((LegendInfo)entry.Content).Name);
             sl.Children.Add(nameLabel);
             return sl;
         });

src/Toolkit/Toolkit.Maui/OverviewMap/OverviewMap.cs

@@ -17,7 +17,6 @@
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.Symbology;
 using Microsoft.Maui.Controls.Internals;
-using System.Diagnostics.CodeAnalysis;
 using Map = Esri.ArcGISRuntime.Mapping.Map;
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui;
@@ -32,8 +31,6 @@ public class OverviewMap : TemplatedView
 
     private MapView? _overviewMapView;
 
-
-    [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.GeoModel.LoadStatus), "Esri.ArcGISRuntime.Mapping.GeoModel", "Esri.ArcGISRuntime")]
     static OverviewMap()
     {
         DefaultControlTemplate = new ControlTemplate(() =>
@@ -50,15 +47,15 @@ static OverviewMap()
                 IsAttributionTextVisible = false
             };
             ActivityIndicator activity = new ActivityIndicator();
-            activity.SetBinding(ActivityIndicator.IsRunningProperty, new Binding("Map.LoadStatus", converter: converter, converterParameter: "Loading", source : mapView));
+            activity.SetBinding(ActivityIndicator.IsRunningProperty, static (MapView mapView) => mapView.Map?.LoadStatus, converter: converter, converterParameter: "Loading", source: mapView);
             root.Add(activity);
             Label label = new Label()
             {
                 TextColor = Colors.Black, Text = "Map failed to load. Did you forget an API key?"
             };
-            label.SetBinding(VisualElement.IsVisibleProperty, new Binding("Map.LoadStatus", converter: converter, converterParameter: "FailedToLoad", source: mapView));
+            label.SetBinding(VisualElement.IsVisibleProperty, static (MapView mapView) => mapView.Map?.LoadStatus, converter: converter, converterParameter: "FailedToLoad", source: mapView);
             root.Add(label);
-            mapView.SetBinding(VisualElement.IsVisibleProperty, new Binding("Map.LoadStatus", converter: converter, converterParameter: "Loaded", source: mapView));
+            mapView.SetBinding(VisualElement.IsVisibleProperty, static (MapView mapView) => mapView.Map?.LoadStatus, converter: converter, converterParameter: "Loaded", source: mapView);
             root.Add(mapView);
             INameScope nameScope = new NameScope();
             NameScope.SetNameScope(rootFrame, nameScope);

src/Toolkit/Toolkit.Maui/SearchView/SearchView.Appearance.cs

@@ -56,7 +56,7 @@ static SearchView()
             containingGrid.SetAppThemeColor(Grid.BackgroundColorProperty, Color.FromArgb("#4e4e4e"), Color.FromArgb("#151515"));
 
             Label textLabel = new Label();
-            textLabel.SetBinding(Label.TextProperty, "Key.DisplayName");
+            textLabel.SetBinding(Label.TextProperty, static (IGrouping<ISearchSource, SearchSuggestion> group) => group.Key.DisplayName);
             textLabel.Margin = new Thickness(4);
             textLabel.TextColor = Colors.White;
             textLabel.FontSize = 14;
@@ -79,21 +79,21 @@ static SearchView()
             textStack.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
 
             Image imageView = new Image();
-            imageView.SetBinding(Image.SourceProperty, nameof(SearchSuggestion.IsCollection), converter: CollectionIconConverter);
+            imageView.SetBinding(Image.SourceProperty, static (SearchSuggestion suggestion) => suggestion.IsCollection, converter: CollectionIconConverter);
             imageView.WidthRequest = 16;
             imageView.HeightRequest = 16;
             imageView.Margin = new Thickness(4);
             imageView.VerticalOptions = LayoutOptions.Center;
 
             Label titleLabel = new Label();
-            titleLabel.SetBinding(Label.TextProperty, nameof(SearchSuggestion.DisplayTitle));
+            titleLabel.SetBinding(Label.TextProperty, static (SearchSuggestion suggestion) => suggestion.DisplayTitle);
             titleLabel.VerticalOptions = LayoutOptions.End;
             titleLabel.VerticalTextAlignment = TextAlignment.End;
             titleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK));
 
             Label subtitleLabel = new Label();
-            subtitleLabel.SetBinding(Label.TextProperty, nameof(SearchSuggestion.DisplaySubtitle));
-            subtitleLabel.SetBinding(Label.IsVisibleProperty, nameof(SearchSuggestion.DisplaySubtitle), converter: EmptyStringConverter);
+            subtitleLabel.SetBinding(Label.TextProperty, static (SearchSuggestion suggestion) => suggestion.DisplaySubtitle);
+            subtitleLabel.SetBinding(Label.IsVisibleProperty, static (SearchSuggestion suggestion) => suggestion.DisplaySubtitle, converter: EmptyStringConverter);
             subtitleLabel.VerticalOptions = LayoutOptions.Start;
             subtitleLabel.VerticalTextAlignment = TextAlignment.Start;
             subtitleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK));
@@ -128,22 +128,22 @@ static SearchView()
             textStack.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
 
             Image imageView = new Image();
-            imageView.SetBinding(Image.SourceProperty, nameof(SearchResult.MarkerImageData), converter: ImageSourceConverter);
+            imageView.SetBinding(Image.SourceProperty, static (SearchResult result) => result.MarkerImageData, converter: ImageSourceConverter);
             imageView.WidthRequest = 24;
             imageView.HeightRequest = 24;
             imageView.Margin = new Thickness(4);
             imageView.VerticalOptions = LayoutOptions.Center;
 
             Label titleLabel = new Label();
-            titleLabel.SetBinding(Label.TextProperty, nameof(SearchResult.DisplayTitle));
+            titleLabel.SetBinding(Label.TextProperty, static (SearchResult result) => result.DisplayTitle);
             titleLabel.FontAttributes = FontAttributes.Bold;
             titleLabel.VerticalOptions = LayoutOptions.End;
             titleLabel.VerticalTextAlignment = TextAlignment.End;
             titleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK));
 
             Label subtitleLabel = new Label();
-            subtitleLabel.SetBinding(Label.TextProperty, nameof(SearchResult.DisplaySubtitle));
-            subtitleLabel.SetBinding(Label.IsVisibleProperty, nameof(SearchResult.DisplaySubtitle), converter: EmptyStringConverter);
+            subtitleLabel.SetBinding(Label.TextProperty, static (SearchResult result) => result.DisplaySubtitle);
+            subtitleLabel.SetBinding(Label.IsVisibleProperty, static (SearchResult result) => result.DisplaySubtitle, converter: EmptyStringConverter);
             subtitleLabel.VerticalOptions = LayoutOptions.Start;
             subtitleLabel.VerticalTextAlignment = TextAlignment.Start;
             subtitleLabel.SetAppThemeColor(Label.TextColorProperty, Color.FromArgb(FOREGROUND_LIGHT), Color.FromArgb(FOREGROUND_DARK));