[automated] Merge branch 'net11.0' => 'release/11.0.1xx-preview2'

eng/pipelines/arcade/setup-test-env.yml

@@ -12,6 +12,8 @@ steps:
   fetchDepth: 1
   clean: true
 
+- template: /eng/pipelines/common/enable-kvm.yml@self
+
 - template: /eng/pipelines/common/provision.yml@self
   parameters:
     checkoutDirectory: '$(System.DefaultWorkingDirectory)'

eng/pipelines/ci.yml

@@ -121,6 +121,13 @@ parameters:
     demands:
       - ImageOverride -equals 1ESPT-Ubuntu22.04
 
+- name: AndroidPoolLinux
+  type: object
+  default:
+    name: MAUI-DNCENG
+    demands:
+      - ImageOverride -equals 1ESPT-Ubuntu22.04
+
 
 # Condition for MacOSPool comparison lanes (non-ARM64)
 # Currently disabled - both pools use MAUI self-hosted since Xcode 26.2 isn't available on Azure Pipelines x64.

eng/pipelines/common/device-tests-steps.yml

@@ -35,14 +35,8 @@ steps:
     continueOnError: true
     timeoutInMinutes: 60
 
-# Enable KVM for Android builds on Linux
 - ${{ if and(ne(parameters.buildType, 'buildOnly'), eq(parameters.platform, 'android')) }}:
-  - bash: |
-      echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-      sudo udevadm control --reload-rules
-      sudo udevadm trigger --name-match=kvm
-    displayName: Enable KVM
-    condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+  - template: enable-kvm.yml
 
 # Provision the various SDKs that are needed
 - template: provision.yml

eng/pipelines/common/enable-kvm.yml

@@ -0,0 +1,8 @@
+# Enable KVM for Android tests on Linux
+steps:
+- bash: |
+    echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+    sudo udevadm control --reload-rules
+    sudo udevadm trigger --name-match=kvm
+  displayName: Enable KVM
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

eng/pipelines/common/ui-tests-steps.yml

@@ -50,14 +50,8 @@ steps:
     continueOnError: true
     timeoutInMinutes: 60
 
-# Enable KVM for Android builds on Linux
 - ${{ if and(ne(parameters.buildType, 'buildOnly'), eq(parameters.platform, 'android')) }}:
-  - bash: |
-      echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-      sudo udevadm control --reload-rules
-      sudo udevadm trigger --name-match=kvm
-    displayName: Enable KVM
-    condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+  - template: enable-kvm.yml
 
 - ${{ if eq(parameters.platform, 'catalyst')}}:
   - bash: |

src/Controls/Maps/src/Circle.cs

@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Maui.Devices.Sensors;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Maps;
@@ -56,5 +57,16 @@ public Color FillColor
 			get => (Color)GetValue(FillColorProperty);
 			set => SetValue(FillColorProperty, value);
 		}
+
+		/// <summary>
+		/// Occurs when the user clicks/taps on the circle element
+		/// </summary>
+		public event EventHandler? CircleClicked;
+
+		void IMapElement.Clicked()
+		{
+			CircleClicked?.Invoke(this, EventArgs.Empty);
+		}
+
 	}
 }

src/Controls/Maps/src/HandlerImpl/MapElement.Impl.cs

@@ -19,5 +19,7 @@ public partial class MapElement : IMapElement
 		float IStroke.StrokeDashOffset => throw new NotImplementedException();
 
 		float IStroke.StrokeMiterLimit => throw new NotImplementedException();
+
+		void IMapElement.Clicked() => throw new NotImplementedException();
 	}
 }

src/Controls/Maps/src/MapElement.cs

@@ -26,6 +26,20 @@ public partial class MapElement : Element
 			typeof(MapElement),
 			5f);
 
+		/// <summary>Bindable property for <see cref="IsVisible"/>.</summary>
+		public static readonly BindableProperty IsVisibleProperty = BindableProperty.Create(
+			nameof(IsVisible),
+			typeof(bool),
+			typeof(MapElement),
+			true);
+
+		/// <summary>Bindable property for <see cref="ZIndex"/>.</summary>
+		public static readonly BindableProperty ZIndexProperty = BindableProperty.Create(
+			nameof(ZIndex),
+			typeof(int),
+			typeof(MapElement),
+			0);
+
 		/// <summary>
 		/// Gets or sets the stroke color. This is a bindable property.
 		/// </summary>
@@ -45,6 +59,28 @@ public float StrokeWidth
 			set => SetValue(StrokeWidthProperty, value);
 		}
 
+		/// <summary>
+		/// Gets or sets a value indicating whether the map element is visible on the map.
+		/// The default value is <see langword="true"/>.
+		/// This is a bindable property.
+		/// </summary>
+		public bool IsVisible
+		{
+			get => (bool)GetValue(IsVisibleProperty);
+			set => SetValue(IsVisibleProperty, value);
+		}
+
+		/// <summary>
+		/// Gets or sets the z-index of the map element, which controls its draw order relative to other elements.
+		/// Higher values are drawn on top of lower values. The default value is <c>0</c>.
+		/// This is a bindable property.
+		/// </summary>
+		public int ZIndex
+		{
+			get => (int)GetValue(ZIndexProperty);
+			set => SetValue(ZIndexProperty, value);
+		}
+
 		/// <summary>
 		/// Gets or sets the platform counterpart of this map element.
 		/// </summary>

src/Controls/Maps/src/Polygon.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Microsoft.Maui.Devices.Sensors;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Maps;
 
 namespace Microsoft.Maui.Controls.Maps
 {
@@ -31,6 +33,16 @@ public Color FillColor
 		/// </summary>
 		public IList<Location> Geopath { get; }
 
+		/// <summary>
+		/// Occurs when the user clicks/taps on the polygon element
+		/// </summary>
+		public event EventHandler? PolygonClicked;
+
+		void IMapElement.Clicked()
+		{
+			PolygonClicked?.Invoke(this, EventArgs.Empty);
+		}
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="Polygon"/> class.
 		/// </summary>

src/Controls/Maps/src/Polyline.cs

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Microsoft.Maui.Devices.Sensors;
+using Microsoft.Maui.Maps;
 
 namespace Microsoft.Maui.Controls.Maps
 {
@@ -14,6 +16,16 @@ public partial class Polyline : MapElement
 		/// </summary>
 		public IList<Location> Geopath { get; }
 
+		/// <summary>
+		/// Occurs when the user clicks/taps on the polyline element
+		/// </summary>
+		public event EventHandler? PolylineClicked;
+
+		void IMapElement.Clicked()
+		{
+			PolylineClicked?.Invoke(this, EventArgs.Empty);
+		}
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="Polyline"/> class.
 		/// </summary>

src/Controls/Maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/Maps/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/Maps/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/Maps/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/Maps/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/Maps/src/PublicAPI/net/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/Maps/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt

@@ -1,4 +1,14 @@
+
 #nullable enable
-static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+Microsoft.Maui.Controls.Maps.Circle.CircleClicked -> System.EventHandler?
 Microsoft.Maui.Controls.Maps.Map.Region.get -> Microsoft.Maui.Maps.MapSpan?
 Microsoft.Maui.Controls.Maps.Map.Region.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.get -> bool
+Microsoft.Maui.Controls.Maps.MapElement.IsVisible.set -> void
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.get -> int
+Microsoft.Maui.Controls.Maps.MapElement.ZIndex.set -> void
+Microsoft.Maui.Controls.Maps.Polygon.PolygonClicked -> System.EventHandler?
+Microsoft.Maui.Controls.Maps.Polyline.PolylineClicked -> System.EventHandler?
+static readonly Microsoft.Maui.Controls.Maps.Map.RegionProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.IsVisibleProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.Maps.MapElement.ZIndexProperty -> Microsoft.Maui.Controls.BindableProperty!

src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapElementClickGallery.xaml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Pages.MapsGalleries.MapElementClickGallery"
+    xmlns:maps="http://schemas.microsoft.com/dotnet/2021/maui/maps"
+    xmlns:sensors="clr-namespace:Microsoft.Maui.Devices.Sensors;assembly=Microsoft.Maui.Essentials"
+    Title="MapElement Click Events">
+    <Grid RowDefinitions="Auto,*">
+        <Label x:Name="StatusLabel" 
+               Text="Tap on a circle, polygon, or polyline"
+               Padding="10"
+               FontSize="16"
+               HorizontalTextAlignment="Center" />
+        <maps:Map x:Name="map" Grid.Row="1">
+            <x:Arguments>
+                <maps:MapSpan>
+                    <x:Arguments>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>37.79752</x:Double>
+                                <x:Double>-122.40183</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <x:Double>0.02</x:Double>
+                        <x:Double>0.02</x:Double>
+                    </x:Arguments>
+                </maps:MapSpan>
+            </x:Arguments>
+        </maps:Map>
+    </Grid>
+</ContentPage>