Fix the FontImageSource for Windows Unpackaged

src/Compatibility/ControlGallery/src/Core/CoreGalleryPages/LabelCoreGalleryPage.cs

@@ -19,7 +19,7 @@ protected override void Build(StackLayout stackLayout)
 		{
 			base.Build(stackLayout);
 
-			var namedSizeMediumBoldContainer = new ViewContainer<Label>(Test.Label.FontAttibutesBold, new Label { Text = "Medium Bold Font", FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Label)), FontAttributes = FontAttributes.Bold });
+			var namedSizeMediumBoldContainer = new ViewContainer<Label>(Test.Label.FontAttributesBold, new Label { Text = "Medium Bold Font", FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Label)), FontAttributes = FontAttributes.Bold });
 
 			var namedSizeMediumItalicContainer = new ViewContainer<Label>(Test.Label.FontAttributesItalic, new Label { Text = "Medium Italic Font", FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Label)), FontAttributes = FontAttributes.Italic });
 

src/Controls/tests/CustomAttributes/Test.cs

@@ -392,6 +392,7 @@ public enum Frame
 	public enum Image
 	{
 		Source,
+		Source_FontImageSource,
 		Aspect,
 		IsOpaque,
 		IsLoading,
@@ -463,7 +464,7 @@ public enum Label
 		Text,
 		Padding,
 		FormattedText,
-		FontAttibutesBold,
+		FontAttributesBold,
 		FontAttributesItalic,
 		TextDecorationUnderline,
 		TextDecorationStrike,
@@ -489,6 +490,7 @@ public enum Label
 		HtmlTextTypeMultipleLines,
 		HtmlTextLabelProperties,
 		TextTypeToggle,
+		FontFamily,
 	}
 
 	public enum ProgressBar

src/Controls/tests/TestCases.Shared.Tests/Tests/ImageUITests.cs

@@ -0,0 +1,39 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests;
+
+[Category(UITestCategories.Image)]
+internal class ImageUITests : _ViewUITests
+{
+	const string ImageGallery = "Image Gallery";
+
+	public ImageUITests(TestDevice device)
+		: base(device)
+	{
+	}
+
+	protected override void NavigateToGallery()
+	{
+		App.NavigateToGallery(ImageGallery);
+	}
+
+	public override void IsEnabled()
+	{
+		Assert.Ignore("Image elements do not really have a concept of being \"disabled\".");
+	}
+
+	[Test]
+	public void Source_FontImageSource()
+	{
+		var remote = GoToStateRemote();
+		VerifyScreenshot("ImageUITests_Source_FontImageSource_FontAwesome");
+
+		remote.TapStateButton();
+		VerifyScreenshot("ImageUITests_Source_FontImageSource_Ionicons");
+
+		remote.TapStateButton();
+		VerifyScreenshot("ImageUITests_Source_FontImageSource_FontAwesome");
+	}
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs

@@ -5,6 +5,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
+[Category(UITestCategories.Label)]
 public class LabelUITests : _ViewUITests
 {
 	const string LabelGallery = "Label Gallery";
@@ -23,7 +24,6 @@ public override void IsEnabled()
 	}
 
 	[Test]
-	[Category(UITestCategories.Label)]
 	public void SpanTapped()
 	{
 		if (Device == TestDevice.Mac)
@@ -45,4 +45,17 @@ public void SpanTapped()
 		var textAfterClick = remote.GetEventLabel().GetText();
 		ClassicAssert.AreEqual("Event: SpanTapped (fired 1)", textAfterClick);
 	}
+
+	[Test]
+	public void FontFamily()
+	{
+		var remote = GoToStateRemote();
+		VerifyScreenshot("LabelUITests_FontFamily_FontAwesome");
+
+		remote.TapStateButton();
+		VerifyScreenshot("LabelUITests_FontFamily_Ionicons");
+
+		remote.TapStateButton();
+		VerifyScreenshot("LabelUITests_FontFamily_FontAwesome");
+	}
 }

src/Controls/tests/TestCases/Controls.TestCases.App.csproj

@@ -48,7 +48,7 @@
     <MauiImage Include="Resources\Images\dotnet_bot.svg" Link="Resources\Images\small_dotnet_bot.svg" Color="#FFFFFF" BaseSize="64,64" />
     <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\OpenSans-Regular.ttf" />
+    <MauiFont Include="Resources\Fonts\**" />
     <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 

src/Controls/tests/TestCases/CoreViews/ViewContainers/StateViewContainer.cs

@@ -12,7 +12,7 @@ internal class StateViewContainer<T> : ViewContainer<T>
 		public Button StateChangeButton { get; private set; }
 		public Label ViewInteractionLabel { get; private set; }
 
-		public StateViewContainer(Enum formsMember, T view) : base(formsMember, view)
+		public StateViewContainer(Enum formsMember, T view, Func<object, string> converterFunc = null) : base(formsMember, view)
 		{
 			var name = formsMember.ToString();
 
@@ -38,6 +38,9 @@ public StateViewContainer(Enum formsMember, T view) : base(formsMember, view)
 
 			var converter = new GenericValueConverter(o =>
 			{
+				if (converterFunc is not null)
+					return converterFunc(o);
+
 				try
 				{
 					var attr = o.GetType().GetCustomAttribute<TypeConverterAttribute>();

src/Controls/tests/TestCases/Elements/ImageCoreGalleryPage.cs

@@ -1,4 +1,5 @@
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
 
 namespace Maui.Controls.Sample;
 
@@ -14,5 +15,23 @@ protected override void InitializeElement(Image element)
 	protected override void Build()
 	{
 		base.Build();
+
+		{
+			var image = new Image
+			{
+				Source = new FontImageSource { FontFamily = "FA", Glyph = "\xf133", Size = 48, Color = Colors.Black },
+				WidthRequest = 48,
+				HeightRequest = 48,
+			};
+			var familyContainer = new StateViewContainer<Image>(Test.Image.Source_FontImageSource, image, o => ((FontImageSource)o).FontFamily);
+			familyContainer.StateChangeButton.Clicked += (s, a) =>
+			{
+				if (image.Source is FontImageSource fis && fis.FontFamily == "FA")
+					image.Source = new FontImageSource { FontFamily = "Ion", Glyph = "\xf30c", Size = 48, Color = Colors.Black };
+				else
+					image.Source = new FontImageSource { FontFamily = "FA", Glyph = "\xf133", Size = 48, Color = Colors.Black };
+			};
+			Add(familyContainer);
+		}
 	}
 }

src/Controls/tests/TestCases/Elements/LabelCoreGalleryPage.cs

@@ -321,5 +321,23 @@ protected override void Build()
 			var toggleHtmlPlainTextLabelContainer = new ViewContainer<Label>(Test.Label.TextTypeToggle, toggleLabel);
 			Add(toggleHtmlPlainTextLabelContainer);
 		}
+
+		{
+			var label = new Label
+			{
+				FontFamily = "FA",
+				FontSize = 48,
+				Text = "\xf133",
+				WidthRequest = 48,
+				HeightRequest = 48,
+			};
+			var familyContainer = new StateViewContainer<Label>(Test.Label.FontFamily, label);
+			familyContainer.StateChangeButton.Clicked += (s, a) =>
+			{
+				label.FontFamily = label.FontFamily == "FA" ? "Ion" : "FA";
+				label.Text = label.FontFamily == "FA" ? "\xf133" : "\xf30c";
+			};
+			Add(familyContainer);
+		}
 	}
 }

src/Controls/tests/TestCases/Issues/Issue21202.xaml

@@ -17,7 +17,7 @@
             TextTransform="Uppercase"
             FontFamily="OpenSansRegular">
             <Button.ImageSource>
-                <FontImageSource Glyph="A" Color="Black" FontFamily="OpenSansRegular"/>
+                <FontImageSource Glyph="&#xf133;" Color="Black" FontFamily="FA"/>
             </Button.ImageSource>
         </Button>
         <Label
@@ -29,7 +29,7 @@
             TextTransform="Uppercase"
             FontFamily="OpenSansRegular">
             <Button.ImageSource>
-                <FontImageSource Glyph="A" Color="Black" FontFamily="OpenSansRegular"/>
+                <FontImageSource Glyph="&#xf133;" Color="Black" FontFamily="FA"/>
             </Button.ImageSource>
         </Button>
         <Label
@@ -41,7 +41,7 @@
             TextTransform="Uppercase"
             FontFamily="OpenSansRegular">
             <Button.ImageSource>
-                <FontImageSource Glyph="A" Size="60" Color="Black" FontFamily="OpenSansRegular"/>
+                <FontImageSource Glyph="&#xf133;" Size="60" Color="Black" FontFamily="FA"/>
             </Button.ImageSource>
         </Button>
     </VerticalStackLayout>

src/Controls/tests/TestCases/MauiProgram.cs

@@ -20,6 +20,8 @@ public static MauiApp CreateMauiApp()
 				.ConfigureFonts(fonts =>
 				{
 					fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+					fonts.AddFont("FontAwesome.ttf", "FA");
+					fonts.AddFont("ionicons.ttf", "Ion");
 				})
 				.Issue21109AddMappers();
 

src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Windows.cs

@@ -127,12 +127,20 @@ string GetFontSource(IFontImageSource imageSource)
 			// unpackaged apps can't load files using packaged schemes
 			if (!AppInfoUtils.IsPackagedApp)
 			{
+				// the Uri type encodes the fragment, so let's remove first
+				var fragment = "";
+				if (fontSource.IndexOf('#', StringComparison.OrdinalIgnoreCase) is int index && index >= 0)
+				{
+					fragment = fontSource.Substring(index);
+					fontSource = fontSource.Substring(0, index);
+				}
+
 				var fontUri = new Uri(fontSource, UriKind.RelativeOrAbsolute);
 
 				var path = fontUri.AbsolutePath.TrimStart('/');
 				if (FileSystemUtils.TryGetAppPackageFileUri(path, out var uri))
 				{
-					fontSource = uri + fontUri.Fragment;
+					fontSource = uri + fragment;
 				}
 			}