devanathan-vaithiyanathan
diff --git a/‎.vscode/settings.json‎
Lines changed: 1 addition & 1 deletion b/‎.vscode/settings.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎eng/pipelines/common/ui-tests.yml‎
Lines changed: 1 addition & 1 deletion b/‎eng/pipelines/common/ui-tests.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/BlazorWebView/src/Maui/BlazorWebView.cs‎
Lines changed: 26 additions & 3 deletions b/‎src/BlazorWebView/src/Maui/BlazorWebView.cs‎
Lines changed: 26 additions & 3 deletions
diff --git a/‎src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs‎
Lines changed: 5 additions & 1 deletion b/‎src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj‎
Lines changed: 4 additions & 0 deletions b/‎src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets‎
Lines changed: 14 additions & 0 deletions b/‎src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs‎
Lines changed: 4 additions & 2 deletions b/‎src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/Compatibility/Maps/src/Android/MapRenderer.cs‎
Lines changed: 14 additions & 0 deletions b/‎src/Compatibility/Maps/src/Android/MapRenderer.cs‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Compatibility/Maps/src/iOS/MapRenderer.cs‎
Lines changed: 14 additions & 0 deletions b/‎src/Compatibility/Maps/src/iOS/MapRenderer.cs‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs‎
Lines changed: 0 additions & 90 deletions b/‎src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs‎
Lines changed: 0 additions & 90 deletions
@@ -1,3 +1,3 @@
 {
     "dotnet.defaultSolution": "Microsoft.Maui-vscode.sln"
-}
+}
@@ -24,7 +24,7 @@ parameters:
     - 'Cells,CheckBox,ContextActions,CustomRenderers,DatePicker,Dispatcher,DisplayAlert,DisplayPrompt,DragAndDrop'
     - 'CollectionView'
     - 'Entry'
-    - 'Editor,Effects,FlyoutPage,Focus,Fonts,Frame,Gestures,GraphicsView'
+    - 'Editor,Effects,Essentials,FlyoutPage,Focus,Fonts,Frame,Gestures,GraphicsView'
     - 'Image,ImageButton,IndicatorView,InputTransparent,IsEnabled,IsVisible'
     - 'Label'
     - 'Layout'
 
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using System.Runtime.Versioning;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Maui;
@@ -10,8 +11,24 @@ namespace Microsoft.AspNetCore.Components.WebView.Maui
 	/// <summary>
 	/// A <see cref="View"/> that can render Blazor content.
 	/// </summary>
+#if ANDROID
+	[SupportedOSPlatform(AndroidSupportedOSPlatformVersion)]
+#elif IOS
+	[SupportedOSPlatform(iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+	[SupportedOSPlatform(MacCatalystSupportedOSPlatformVersion)]
+#endif
 	public partial class BlazorWebView : View, IBlazorWebView
 	{
+		// NOTE: keep these in *reasonably* in sync with:
+		// * src\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj
+		// * src\Templates\src\templates\maui-blazor\MauiApp.1.csproj
+		// * src\Templates\src\templates\maui-blazor-solution\MauiApp.1\MauiApp.1.csproj
+		// * https://learn.microsoft.com/dotnet/maui/supported-platforms
+		internal const string AndroidSupportedOSPlatformVersion = "android24.0";
+		internal const string iOSSupportedOSPlatformVersion = "ios15.0";
+		internal const string MacCatalystSupportedOSPlatformVersion = "maccatalyst15.0";
+
 		internal static string AppHostAddress { get; } = HostAddressHelper.GetAppHostAddress();
 
 		private readonly JSComponentConfigurationStore _jSComponents = new();
@@ -80,9 +97,11 @@ public string StartPath
 
 		/// <inheritdoc />
 #if ANDROID
-		[System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
+		[System.Runtime.Versioning.SupportedOSPlatform(AndroidSupportedOSPlatformVersion)]
 #elif IOS
-		[System.Runtime.Versioning.SupportedOSPlatform("ios11.0")]
+		[System.Runtime.Versioning.SupportedOSPlatform(iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+		[System.Runtime.Versioning.SupportedOSPlatform(MacCatalystSupportedOSPlatformVersion)]
 #endif
 		public virtual IFileProvider CreateFileProvider(string contentRootDir)
 		{
@@ -97,7 +116,11 @@ public virtual IFileProvider CreateFileProvider(string contentRootDir)
 		/// <returns>Returns a <see cref="Task"/> representing <c>true</c> if the <paramref name="workItem"/> was called, or <c>false</c> if it was not called because Blazor is not currently running.</returns>
 		/// <exception cref="ArgumentNullException">Thrown if <paramref name="workItem"/> is <c>null</c>.</exception>
 #if ANDROID
-		[System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
+		[System.Runtime.Versioning.SupportedOSPlatform(AndroidSupportedOSPlatformVersion)]
+#elif IOS
+		[System.Runtime.Versioning.SupportedOSPlatform(iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+		[System.Runtime.Versioning.SupportedOSPlatform(MacCatalystSupportedOSPlatformVersion)]
 #endif
 		public virtual async Task<bool> TryDispatchAsync(Action<IServiceProvider> workItem)
 		{
 
@@ -9,7 +9,11 @@
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
 #if ANDROID
-	[SupportedOSPlatform("android23.0")]
+	[SupportedOSPlatform(BlazorWebView.AndroidSupportedOSPlatformVersion)]
+#elif IOS
+	[SupportedOSPlatform(BlazorWebView.iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+	[SupportedOSPlatform(BlazorWebView.MacCatalystSupportedOSPlatformVersion)]
 #endif
 	public partial class BlazorWebViewHandler
 	{
 
@@ -23,6 +23,10 @@
     <PackageTags>$(DefaultPackageTags);blazor;webview;aspnet</PackageTags>
     <PackageIconFullPath>$(MauiRootDirectory)Assets\aspnet-icon.png</PackageIconFullPath>
     <Description>Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control.</Description>
+    <!-- NOTE: keep in sync with BlazorWebView.cs -->
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
 
@@ -121,4 +121,18 @@
     </ItemGroup>
   </Target>
 
+  <!-- Include computed static web assets in the single-file bundle. Other static web assets
+       are already included via the normal ResolvedFileToPublish flow. -->
+  <Target Name="_IncludeComputedStaticWebAssetsInSingleFileBundle"
+          AfterTargets="_ComputeFilesToBundle"
+          BeforeTargets="PrepareForBundle"
+          Condition="'$(PublishSingleFile)' == 'true'">
+
+    <ItemGroup>
+      <_FilesToBundle Include="@(_PublishStaticWebAssetsPreserveNewest)" Condition="'%(_PublishStaticWebAssetsPreserveNewest.SourceType)' == 'Computed'">
+        <RelativePath>%(_PublishStaticWebAssetsPreserveNewest.TargetPath)</RelativePath>
+      </_FilesToBundle>
+    </ItemGroup>
+  </Target>
+
 </Project>
@@ -30,9 +30,11 @@ public static IWindowsFormsBlazorWebViewBuilder AddWindowsFormsBlazorWebView(thi
 		public static IWpfBlazorWebViewBuilder AddWpfBlazorWebView(this IServiceCollection services)
 #elif WEBVIEW2_MAUI
 #if ANDROID
-	    [System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
+	    [System.Runtime.Versioning.SupportedOSPlatform(BlazorWebView.AndroidSupportedOSPlatformVersion)]
 #elif IOS
-		[System.Runtime.Versioning.SupportedOSPlatform("ios11.0")]
+		[System.Runtime.Versioning.SupportedOSPlatform(BlazorWebView.iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+		[System.Runtime.Versioning.SupportedOSPlatform(BlazorWebView.MacCatalystSupportedOSPlatformVersion)]
 #endif
 		public static IMauiBlazorWebViewBuilder AddMauiBlazorWebView(this IServiceCollection services)
 #else
 
@@ -46,6 +46,7 @@ public class MapRenderer : Handlers.Compatibility.ViewRenderer<Map, MapView>, Go
 		List<APolyline> _polylines;
 		List<APolygon> _polygons;
 		List<ACircle> _circles;
+		List<MapElement> _trackedMapElements;
 
 		public MapRenderer(Context context) : base(context)
 		{
@@ -581,6 +582,16 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
 					AddMapElements(e.NewItems.Cast<MapElement>());
 					break;
 				case NotifyCollectionChangedAction.Reset:
+					// Clear MapElementId from tracked elements (not Element.MapElements,
+					// which is already empty after ObservableCollection.Clear())
+					if (_trackedMapElements != null)
+					{
+						foreach (var element in _trackedMapElements)
+							element.MapElementId = null;
+
+						_trackedMapElements = null;
+					}
+
 					if (_polylines != null)
 					{
 						for (int i = 0; i < _polylines.Count; i++)
@@ -612,8 +623,11 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
 
 		void AddMapElements(IEnumerable<MapElement> mapElements)
 		{
+			_trackedMapElements ??= new List<MapElement>();
+
 			foreach (var element in mapElements)
 			{
+				_trackedMapElements.Add(element);
 				element.PropertyChanged += MapElementPropertyChanged;
 
 				switch (element)
 
@@ -31,6 +31,7 @@ public class MapRenderer : Microsoft.Maui.Controls.Handlers.Compatibility.ViewRe
 		bool _shouldUpdateRegion;
 		object _lastTouchedView;
 		bool _disposed;
+		List<MapElement> _trackedMapElements;
 
 #if __MOBILE__
 		UITapGestureRecognizer _mapClickedGestureRecognizer;
@@ -528,6 +529,16 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
 				case NotifyCollectionChangedAction.Reset:
 					var mkMapView = (MKMapView)Control;
 
+					// Clear MapElementId from tracked elements (not Element.MapElements,
+					// which is already empty after ObservableCollection.Clear())
+					if (_trackedMapElements != null)
+					{
+						foreach (var mapElement in _trackedMapElements)
+							mapElement.MapElementId = null;
+
+						_trackedMapElements = null;
+					}
+
 					if (mkMapView.Overlays != null)
 					{
 						var overlays = mkMapView.Overlays;
@@ -544,8 +555,11 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
 
 		void AddMapElements(IEnumerable<MapElement> mapElements)
 		{
+			_trackedMapElements ??= new List<MapElement>();
+
 			foreach (var element in mapElements)
 			{
+				_trackedMapElements.Add(element);
 				element.PropertyChanged += MapElementPropertyChanged;
 
 				IMKOverlay overlay = null;
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`	`2`	`"dotnet.defaultSolution": "Microsoft.Maui-vscode.sln"`
`3`		`-}`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,11 @@`
`9`	`9`	`namespace Microsoft.AspNetCore.Components.WebView.Maui`
`10`	`10`	`{`
`11`	`11`	`#if ANDROID`
`12`		`- [SupportedOSPlatform("android23.0")]`
	`12`	`+ [SupportedOSPlatform(BlazorWebView.AndroidSupportedOSPlatformVersion)]`
	`13`	`+#elif IOS`
	`14`	`+ [SupportedOSPlatform(BlazorWebView.iOSSupportedOSPlatformVersion)]`
	`15`	`+#elif MACCATALYST`
	`16`	`+ [SupportedOSPlatform(BlazorWebView.MacCatalystSupportedOSPlatformVersion)]`
`13`	`17`	`#endif`
`14`	`18`	`public partial class BlazorWebViewHandler`
`15`	`19`	`{`