Fixes dotnet#16923

greg84 · Aug 22, 2023 · 3396d23 · 3396d23
1 parent a7d2c9d
commit 3396d23
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/Core/src/Fonts/FontRegistrar.cs b/src/Core/src/Fonts/FontRegistrar.cs
@@ -50,7 +50,7 @@ public void Register(string filename, string? alias)
 		/// <inheritdoc/>
 		public string? GetFont(string font)
 		{
-			if (_fontLookupCache.TryGetValue(font, out var foundResult))
+			if (_fontLookupCache.TryGetValue(font, out var foundResult) && File.Exists(foundResult))
 				return foundResult;
 
 			try

diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderFontsTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderFontsTests.cs
@@ -59,6 +59,42 @@ public void ConfigureFontsRegistersFonts(string filename, string alias)
 			Directory.Delete(root, true);
 		}
 
+		[Fact]
+		public void FontShouldBeCopiedAgainIfTempFolderIsClearedDuringRuntime()
+		{
+			var root = Path.Combine(Path.GetTempPath(), "Microsoft.Maui.UnitTests", "ConfigureFontsRegistersFonts", Guid.NewGuid().ToString());
+			var filename = "Dokdo-Regular.ttf";
+			var alias = "Dokdo";
+
+			var builder = MauiApp
+				.CreateBuilder()
+				.ConfigureFonts(fonts => fonts.AddEmbeddedResourceFont(GetType().Assembly, filename, alias));
+			builder.Services.AddSingleton<IEmbeddedFontLoader>(_ => new FileSystemEmbeddedFontLoader(root));
+			var mauiApp = builder.Build();
+
+			var registrar = mauiApp.Services.GetRequiredService<IFontRegistrar>();
+
+			var path = registrar.GetFont(filename);
+			Assert.True(File.Exists(path));
+
+			File.Delete(path);
+
+			path = registrar.GetFont(alias);
+			Assert.True(File.Exists(path));
+
+			File.Delete(path);
+
+			path = registrar.GetFont(filename);
+			Assert.True(File.Exists(path));
+
+			File.Delete(path);
+
+			path = registrar.GetFont(alias);
+			Assert.True(File.Exists(path));
+
+			Directory.Delete(root, true);
+		}
+
 		[Fact]
 		public void NullAssemblyForEmbeddedFontThrows()
 		{