From 8072ebc313d89c9b5b31b51a5e83c19036dcba7c Mon Sep 17 00:00:00 2001
From: Jay Cho <jh5.cho@samsung.com>
Date: Mon, 14 Jun 2021 17:30:58 +0900
Subject: [PATCH] Update tizen manifest path

---
 .nuspec/Microsoft.Maui.Resizetizer.targets              | 4 +++-
 src/Core/src/Fonts/EmbeddedFontLoader.Tizen.cs          | 2 ++
 src/SingleProject/Resizetizer/src/TizenSplashUpdator.cs | 5 ++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets
index ec77275b0143..75d11a30afbb 100644
--- a/.nuspec/Microsoft.Maui.Resizetizer.targets
+++ b/.nuspec/Microsoft.Maui.Resizetizer.targets
@@ -464,10 +464,12 @@
 
         <!-- WPF -->
         <ItemGroup Condition="'$(_ResizetizerIsWPFApp)' == 'True'">
+
             <Resource Include="@(_MauiFontCopied)" Condition="'@(_MauiFontCopied)' != ''">
                 <LogicalName>$([System.IO.Path]::GetFileName(%(_MauiFontCopied.Identity)))</LogicalName>
                 <Link>$([System.IO.Path]::GetFileName(%(_MauiFontCopied.Identity)))</Link>
             </Resource>
+
         </ItemGroup>
 
         <!-- Tizen -->
@@ -520,8 +522,8 @@
         <!-- Tizen - Move splash images to a specific location -->
         <TizenSplashUpdator
             Condition="'$(_ResizetizerIsTizenApp)' == 'True'"
-            ManifestFile="$(TizenManifestFile)"
             IntermediateOutputPath="$(ResizetizerIntermediateOutputPath)"
+            ManifestFile="$(TizenManifestFile)"
             MauiSplashScreen="@(MauiSplashScreen)" />
 
         <ItemGroup>
diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.Tizen.cs b/src/Core/src/Fonts/EmbeddedFontLoader.Tizen.cs
index d4cba12a6788..10b13494cf13 100644
--- a/src/Core/src/Fonts/EmbeddedFontLoader.Tizen.cs
+++ b/src/Core/src/Fonts/EmbeddedFontLoader.Tizen.cs
@@ -36,10 +36,12 @@ public partial class EmbeddedFontLoader : IEmbeddedFontLoader
 					font.ResourceStream.CopyTo(fileStream);
 				}
 
+#if __TIZEN__
 				if (DotnetUtil.TizenAPIVersion > 5)
 				{
 					Utility.FontReinit();
 				}
+#endif
 				return name;
 			}
 			catch (Exception ex)
diff --git a/src/SingleProject/Resizetizer/src/TizenSplashUpdator.cs b/src/SingleProject/Resizetizer/src/TizenSplashUpdator.cs
index 46172cf40cb5..f0ad58103327 100644
--- a/src/SingleProject/Resizetizer/src/TizenSplashUpdator.cs
+++ b/src/SingleProject/Resizetizer/src/TizenSplashUpdator.cs
@@ -13,12 +13,11 @@ public class TizenSplashUpdator : Task
 		[Required]
 		public ITaskItem[] MauiSplashScreen { get; set; }
 
-		[Required]
-		public string ManifestFile { get; set; }
-
 		[Required]
 		public string IntermediateOutputPath { get; set; }
 
+		public string ManifestFile { get; set; } = "tizen-manifest.xml";
+
 		public ILogger Logger { get; private set; }
 
 		public override bool Execute()