From 40d36070012cae492a5db1f2c55b5b1c872b302e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 27 Nov 2025 13:45:42 +0000 Subject: [PATCH 1/2] Initial plan From b40ce34db84d440d46585340b36db6b9671857b4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 27 Nov 2025 13:51:54 +0000 Subject: [PATCH 2/2] Replace deprecated FontImage with FontImageSource and add deprecation notes Co-authored-by: jfversluis <939291+jfversluis@users.noreply.github.com> --- docs/tutorials/notes-app.md | 2 +- .../snippets/notes-app/allnotes/Views/AllNotesPage.xaml | 2 +- .../snippets/notes-mvvm/bugs/Views/AllNotesPage.xaml | 2 +- .../snippets/notes-mvvm/model/Views/AllNotesPage.xaml | 2 +- .../notes-mvvm/viewmodel-shared/Views/AllNotesPage.xaml | 2 +- docs/user-interface/controls/image.md | 3 +++ docs/user-interface/fonts.md | 4 ++++ docs/xaml/markup-extensions/consume.md | 2 +- 8 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/tutorials/notes-app.md b/docs/tutorials/notes-app.md index 0c56bf6b0..4a78a5803 100644 --- a/docs/tutorials/notes-app.md +++ b/docs/tutorials/notes-app.md @@ -568,7 +568,7 @@ The previous XAML introduces a few new concepts: - The `ContentPage.ToolbarItems` property contains a `ToolbarItem`. The buttons defined here are usually display at the top of the app, along the page title. Depending on the platform, though, it might be in a different position. When one of these buttons is pressed, the `Clicked` event is raised, just like a normal button. - The `ToolbarItem.IconImageSource` property sets the icon to display on the button. The icon can be any image resource defined by the project, however, in this example, a `FontImage` is used. A `FontImage` can use a single glyph from a font as an image. + The `ToolbarItem.IconImageSource` property sets the icon to display on the button. The icon can be any image resource defined by the project, however, in this example, a `FontImageSource` is used. A `FontImageSource` can use a single glyph from a font as an image. - The control displays a collection of items, and in this case, is bound to the model's `Notes` property. The way each item is presented by the collection view is set through the `CollectionView.ItemsLayout` and `CollectionView.ItemTemplate` properties. diff --git a/docs/tutorials/snippets/notes-app/allnotes/Views/AllNotesPage.xaml b/docs/tutorials/snippets/notes-app/allnotes/Views/AllNotesPage.xaml index f5ad2f036..e16e98c15 100644 --- a/docs/tutorials/snippets/notes-app/allnotes/Views/AllNotesPage.xaml +++ b/docs/tutorials/snippets/notes-app/allnotes/Views/AllNotesPage.xaml @@ -7,7 +7,7 @@ x:DataType="models:AllNotes"> - + diff --git a/docs/tutorials/snippets/notes-mvvm/bugs/Views/AllNotesPage.xaml b/docs/tutorials/snippets/notes-mvvm/bugs/Views/AllNotesPage.xaml index 7f0ec974e..02795768c 100644 --- a/docs/tutorials/snippets/notes-mvvm/bugs/Views/AllNotesPage.xaml +++ b/docs/tutorials/snippets/notes-mvvm/bugs/Views/AllNotesPage.xaml @@ -11,7 +11,7 @@ - + diff --git a/docs/tutorials/snippets/notes-mvvm/model/Views/AllNotesPage.xaml b/docs/tutorials/snippets/notes-mvvm/model/Views/AllNotesPage.xaml index faab926c9..c36961519 100644 --- a/docs/tutorials/snippets/notes-mvvm/model/Views/AllNotesPage.xaml +++ b/docs/tutorials/snippets/notes-mvvm/model/Views/AllNotesPage.xaml @@ -5,7 +5,7 @@ Title="Your Notes"> - + diff --git a/docs/tutorials/snippets/notes-mvvm/viewmodel-shared/Views/AllNotesPage.xaml b/docs/tutorials/snippets/notes-mvvm/viewmodel-shared/Views/AllNotesPage.xaml index c1261acfa..7dca66566 100644 --- a/docs/tutorials/snippets/notes-mvvm/viewmodel-shared/Views/AllNotesPage.xaml +++ b/docs/tutorials/snippets/notes-mvvm/viewmodel-shared/Views/AllNotesPage.xaml @@ -11,7 +11,7 @@ - + diff --git a/docs/user-interface/controls/image.md b/docs/user-interface/controls/image.md index 27ed9171d..27a5dcc1a 100644 --- a/docs/user-interface/controls/image.md +++ b/docs/user-interface/controls/image.md @@ -225,6 +225,9 @@ Image image = new Image The [`FontImage`](xref:Microsoft.Maui.Controls.Xaml.FontImageExtension) markup extension enables you to display a font icon in any view that can display an . It provides the same functionality as the class, but with a more concise representation. +> [!NOTE] +> The `FontImage` markup extension is deprecated in .NET 10 and will be removed in a future release. Use instead. + The [`FontImage`](xref:Microsoft.Maui.Controls.Xaml.FontImageExtension) markup extension is supported by the class, which defines the following properties: - `FontFamily` of type `string`, the font family to which the font icon belongs. diff --git a/docs/user-interface/fonts.md b/docs/user-interface/fonts.md index cc7d9272b..e38d761d5 100644 --- a/docs/user-interface/fonts.md +++ b/docs/user-interface/fonts.md @@ -267,4 +267,8 @@ The following screenshot shows several font icons being displayed: :::image type="content" source="media/fonts/font-image-source.png" alt-text="Screenshot of three font icons."::: +::: moniker range=">=net-maui-8.0 <=net-maui-9.0" + Alternatively, you can display a font icon with the [`FontImage`](xref:Microsoft.Maui.Controls.Xaml.FontImageExtension) markup extension. For more information, see [Load a font icon](~/user-interface/controls/image.md#load-a-font-icon). + +::: moniker-end diff --git a/docs/xaml/markup-extensions/consume.md b/docs/xaml/markup-extensions/consume.md index 9481c6bcd..a8e4af41f 100644 --- a/docs/xaml/markup-extensions/consume.md +++ b/docs/xaml/markup-extensions/consume.md @@ -34,7 +34,7 @@ In addition to the markup extensions discussed in this article, the following ma - [`AppThemeBinding`](xref:Microsoft.Maui.Controls.Xaml.AppThemeBindingExtension) - specifies a resource to be consumed based on the current system theme. For more information, see [AppThemeBinding markup extension](~/user-interface/system-theme-changes.md#appthemebinding-markup-extension). - [`Binding`](xref:Microsoft.Maui.Controls.Xaml.BindingExtension) - establishes a link between properties of two objects. For more information, see [Data binding](~/fundamentals/data-binding/index.md). - [`DynamicResource`](xref:Microsoft.Maui.Controls.Xaml.DynamicResourceExtension) - responds to changes in objects in a resource dictionary. For more information, see [Dynamic styles](~/user-interface/styles/xaml.md#dynamic-styles). -- [`FontImage`](xref:Microsoft.Maui.Controls.Xaml.FontImageExtension) - displays a font icon in any view that can display an . For more information, see [Load a font icon](~/user-interface/controls/image.md#load-a-font-icon). +- [`FontImage`](xref:Microsoft.Maui.Controls.Xaml.FontImageExtension) - displays a font icon in any view that can display an . This markup extension is deprecated in .NET 10. For more information, see [Load a font icon](~/user-interface/controls/image.md#load-a-font-icon). - [`OnIdiom`](xref:Microsoft.Maui.Controls.Xaml.OnIdiomExtension) - customizes UI appearance based on the idiom of the device the application is running on. For more information, see [Customize UI appearance based on the device idiom](~/platform-integration/customize-ui-appearance.md#customize-ui-appearance-based-on-the-device-idiom). - [`OnPlatform`](xref:Microsoft.Maui.Controls.Xaml.OnPlatformExtension) - customizes UI appearance on a per-platform basis. For more information, see [Customize UI appearance based on the platform](~/platform-integration/customize-ui-appearance.md#customize-ui-appearance-based-on-the-platform). - [`RelativeSource`](xref:Microsoft.Maui.Controls.Xaml.RelativeSourceExtension) - sets the binding source relative to the position of the binding target. For more information, see [Relative bindings](~/fundamentals/data-binding/relative-bindings.md).