[net9.0] Merge main to net9.0 (#22840)

### Description of Change

Bring latest changes from main to net9 branch

Author: rmarinho

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -57,16 +57,6 @@ body:
         - 8.0.7 SR2
         - 8.0.6 SR1
         - 8.0.3 GA
-        - 7.0.101
-        - 7.0.100
-        - 7.0.96
-        - 7.0.92
-        - 7.0.86
-        - 7.0.81
-        - 7.0.59
-        - 7.0.58
-        - 7.0.52
-        - 7.0.49
         - Nightly / CI build (Please specify exact version)
         - Unknown/Other
     validations:

NuGet.config

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+
+  <!-- Define the package sources: all mirrors or internal feeds. -->
+  <!-- `clear` ensures no additional sources are inherited from another config file. -->
   <packageSources>
     <clear />
 
@@ -17,7 +20,8 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-pub-dotnet-runtime-919e5b2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-919e5b2b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
-    <!-- <add key="local" value="artifacts" /> -->
+    <add key="local" value="LOCAL_PLACEHOLDER" />
+    <add key="nuget-only" value="NUGET_ONLY_PLACEHOLDER" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
@@ -26,9 +30,20 @@
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
   </packageSources>
+
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>
-  <disabledPackageSources />
+
+  <disabledPackageSources>
+    <add key="local" value="true" />
+    <add key="nuget-only" value="true" />
+  </disabledPackageSources>
+
+  <!-- Define mappings by adding package patterns beneath the target source. -->
+  <!-- Some packages will restore from different locations, but most will be from `dotnet-public`. -->
+  <!-- The key value for <packageSource> should match key values from <packageSources> element. -->
+
 </configuration>

eng/cake/dotnet.cake

@@ -28,6 +28,7 @@ var NuGetOnlyPackages = new string[] {
     "Microsoft.Maui.Essentials.*.{nupkg,snupkg}",
     "Microsoft.Maui.Graphics.*.{nupkg,snupkg}",
     "Microsoft.Maui.Maps.*.{nupkg,snupkg}",
+    "Microsoft.Maui.Resizetizer.*.{nupkg,snupkg}",
     "Microsoft.AspNetCore.Components.WebView.*.{nupkg,snupkg}",
 };
 public enum RuntimeVariant
@@ -55,10 +56,8 @@ Task("dotnet")
         {
             EnsureDirectoryExists(nugetSource);
             var originalNuget = File("./NuGet.config");
-            ReplaceTextInFiles(
-                originalNuget,
-                 $"<!-- <add key=\"local\" value=\"artifacts\" /> -->",
-                $"<add key=\"nuget-only\" value=\"{nugetSource}\" />");
+            ReplaceTextInFiles(originalNuget, "<add key=\"nuget-only\" value=\"true\" />", "");
+            ReplaceTextInFiles(originalNuget, "NUGET_ONLY_PLACEHOLDER", nugetSource);
         }
 
         DotNetBuild("./src/DotNet/DotNet.csproj", new DotNetBuildSettings
@@ -295,10 +294,8 @@ Task("dotnet-pack-maui")
         {
             EnsureDirectoryExists(nugetSource);
             var originalNuget = File("./NuGet.config");
-            ReplaceTextInFiles(
-                originalNuget,
-                $"<!-- <add key=\"local\" value=\"artifacts\" /> -->",
-                $"<add key=\"local\" value=\"{nugetSource}\" />");
+            ReplaceTextInFiles(originalNuget, "<add key=\"local\" value=\"true\" />", "");
+            ReplaceTextInFiles(originalNuget, "LOCAL_PLACEHOLDER", nugetSource);
         }
 
         var sln = "./Microsoft.Maui.Packages.slnf";
@@ -332,7 +329,7 @@ Task("dotnet-pack-additional")
             Version = nativeAssetsVersion,
             ExcludeVersion = true,
             OutputDirectory = assetsDir,
-            Source = new[] { "https://aka.ms/skiasharp-eap/index.json" },
+            Source = new[] { "https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" },
         });
         foreach (var nupkg in GetFiles($"{assetsDir}/**/*.nupkg"))
             DeleteFile(nupkg);
@@ -838,10 +835,8 @@ DirectoryPath PrepareSeparateBuildContext(string dirName, string props = null, s
     }
 
     // Add a specific folder for nuget-only packages
-    ReplaceTextInFiles(
-        config.FullPath,
-        $"<!-- <add key=\"local\" value=\"artifacts\" /> -->",
-        $"<add key=\"nuget-only\" value=\"{nugetOnly.FullPath}\" />");
+    ReplaceTextInFiles(config.FullPath, "<add key=\"nuget-only\" value=\"true\" />", "");
+    ReplaceTextInFiles(config.FullPath, "NUGET_ONLY_PLACEHOLDER", nugetOnly.FullPath);
 
     // Create empty or copy test Directory.Build.props/targets
     if (string.IsNullOrEmpty(props))

src/Controls/samples/Controls.Sample.Sandbox/App.xaml

@@ -0,0 +1,13 @@
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Maui.Controls.Sample"
+             x:Class="Maui.Controls.Sample.App">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

src/Controls/samples/Controls.Sample.Sandbox/App.xaml.cs

@@ -0,0 +1,24 @@
+namespace Maui.Controls.Sample;
+
+public partial class App : Application
+{
+	public App()
+	{
+		InitializeComponent();
+	}
+
+	protected override Window CreateWindow(IActivationState? activationState)
+	{
+		// To test shell scenarios, change this to true
+		bool useShell = false;
+
+		if (!useShell)
+		{
+			return new Window(new NavigationPage(new MainPage()));
+		}
+		else
+		{
+			return new Window(new SandboxShell());
+		}
+	}
+}

src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml

@@ -3,4 +3,5 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Maui.Controls.Sample.MainPage"
     xmlns:local="clr-namespace:Maui.Controls.Sample">
+
 </ContentPage>

src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml.cs

@@ -1,18 +1,9 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Maui;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Graphics;
+namespace Maui.Controls.Sample;
 
-namespace Maui.Controls.Sample
+public partial class MainPage : ContentPage
 {
-	public partial class MainPage : ContentPage
+	public MainPage()
 	{
-		public MainPage()
-		{
-			InitializeComponent();
-		}
+		InitializeComponent();
 	}
-}
+}

src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj

@@ -6,6 +6,8 @@
     <SingleProject>true</SingleProject>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <!-- Disable multi-RID builds to workaround a parallel build issue -->
     <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst')) and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'arm64'">maccatalyst-arm64</RuntimeIdentifier>
@@ -43,6 +45,8 @@
     <MauiImage Update="Resources\Images\dotnet_bot.svg" Color="#FFFFFF" BaseSize="168,208" />
     <MauiImage Include="Resources\AppIcons\appicon.svg" ForegroundFile="Resources\AppIcons\appicon_foreground.svg" IsAppIcon="true" />
     <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF" BaseSize="168,208" />
+    <MauiFont Include="Resources\Fonts\*" />
+    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <Import Project="$(MauiSrcDirectory)Maui.InTree.props" Condition=" '$(UseMaui)' != 'true' " />

src/Controls/samples/Controls.Sample.Sandbox/MauiProgram.cs

@@ -1,37 +1,26 @@
-using Microsoft.Maui;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Hosting;
-using Microsoft.Maui.Hosting;
+namespace Maui.Controls.Sample;
 
-namespace Maui.Controls.Sample
+public static class MauiProgram
 {
-	public static class MauiProgram
-	{
-		public static MauiApp CreateMauiApp() =>
-			MauiApp
-				.CreateBuilder()
+	public static MauiApp CreateMauiApp() =>
+		MauiApp
+			.CreateBuilder()
 #if __ANDROID__ || __IOS__
-				.UseMauiMaps()
+			.UseMauiMaps()
 #endif
-				.UseMauiApp<App>()
-				.Build();
-	}
-
-	class App : Application
-	{
-		protected override Window CreateWindow(IActivationState? activationState)
-		{
-			// To test shell scenarios, change this to true
-			bool useShell = false;
-
-			if (!useShell)
-			{
-				return new Window(new NavigationPage(new MainPage()));
-			}
-			else
+			.UseMauiApp<App>()
+			.ConfigureFonts(fonts =>
 			{
-				return new Window(new SandboxShell());
-			}
-		}
-	}
-}
+				fonts.AddFont("Dokdo-Regular.ttf", "Dokdo");
+				fonts.AddFont("LobsterTwo-Regular.ttf", "Lobster Two");
+				fonts.AddFont("LobsterTwo-Bold.ttf", "Lobster Two Bold");
+				fonts.AddFont("LobsterTwo-Italic.ttf", "Lobster Two Italic");
+				fonts.AddFont("LobsterTwo-BoldItalic.ttf", "Lobster Two BoldItalic");
+				fonts.AddFont("ionicons.ttf", "Ionicons");
+				fonts.AddFont("SegoeUI.ttf", "Segoe UI");
+				fonts.AddFont("SegoeUI-Bold.ttf", "Segoe UI Bold");
+				fonts.AddFont("SegoeUI-Italic.ttf", "Segoe UI Italic");
+				fonts.AddFont("SegoeUI-Bold-Italic.ttf", "Segoe UI Bold Italic");
+			})
+			.Build();
+}

src/Controls/samples/Controls.Sample.Sandbox/Resources/Fonts/Dokdo-Regular.ttf

@@ -0,0 +1 @@
+This is a raw MauiAsset file.

src/Controls/samples/Controls.Sample.Sandbox/Resources/Fonts/LobsterTwo-Bold.ttf

@@ -1,17 +1,9 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Maui;
-using Microsoft.Maui.Controls;
+namespace Maui.Controls.Sample;
 
-namespace Maui.Controls.Sample
+public partial class SandboxShell : Shell
 {
-	public partial class SandboxShell : Shell
+	public SandboxShell()
 	{
-		public SandboxShell()
-		{
-			InitializeComponent();
-		}
+		InitializeComponent();
 	}
-}
+}

src/Controls/samples/Controls.Sample.Sandbox/Resources/Fonts/LobsterTwo-BoldItalic.ttf

@@ -64,13 +64,10 @@ void NotifyStrokeShapeChanges()
 
 			if (strokeShape is VisualElement visualElement)
 			{
-				SetInheritedBindingContext(visualElement, BindingContext);
+				AddLogicalChild(visualElement);
 				_strokeShapeChanged ??= (sender, e) => OnPropertyChanged(nameof(StrokeShape));
 				_strokeShapeProxy ??= new();
 				_strokeShapeProxy.Subscribe(visualElement, _strokeShapeChanged);
-
-				OnParentResourcesChanged(this.GetMergedResources());
-				((IElementDefinition)this).AddResourcesChangedListener(visualElement.OnParentResourcesChanged);
 			}
 		}
 
@@ -80,9 +77,7 @@ void StopNotifyingStrokeShapeChanges()
 
 			if (strokeShape is VisualElement visualElement)
 			{
-				((IElementDefinition)this).RemoveResourcesChangedListener(visualElement.OnParentResourcesChanged);
-
-				SetInheritedBindingContext(visualElement, null);
+				RemoveLogicalChild(visualElement);
 				_strokeShapeProxy?.Unsubscribe();
 			}
 		}

src/Controls/samples/Controls.Sample.Sandbox/Resources/Fonts/LobsterTwo-Italic.ttf

@@ -12,7 +12,8 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty("Actions")]
 	public sealed class EventTrigger : TriggerBase
 	{
-		readonly List<BindableObject> _associatedObjects = new List<BindableObject>();
+		static readonly MethodInfo s_handlerinfo = typeof(EventTrigger).GetRuntimeMethods().Single(mi => mi.Name == "OnEventTriggered" && mi.IsPublic == false);
+		readonly List<WeakReference<BindableObject>> _associatedObjects = new List<WeakReference<BindableObject>>();
 
 		EventInfo _eventinfo;
 
@@ -49,13 +50,20 @@ internal override void OnAttachedTo(BindableObject bindable)
 			base.OnAttachedTo(bindable);
 			if (!string.IsNullOrEmpty(Event))
 				AttachHandlerTo(bindable);
-			_associatedObjects.Add(bindable);
+			_associatedObjects.Add(new WeakReference<BindableObject>(bindable));
 		}
 
 		internal override void OnDetachingFrom(BindableObject bindable)
 		{
-			_associatedObjects.Remove(bindable);
-			DetachHandlerFrom(bindable);
+			_associatedObjects.RemoveAll(wr =>
+			{
+				if (wr.TryGetTarget(out var target) && target == bindable)
+				{
+					DetachHandlerFrom(bindable);
+					return true;
+				}
+				return false;
+			});
 			base.OnDetachingFrom(bindable);
 		}