Merge pull request #825 from unoplatform/dev/eb/xaml-trimming

fix: Specify root mode for root assembly
unoplatform · Feb 15, 2024 · 07dbe6f · 07dbe6f
2 parents 17f3ee7 + 5cee302
commit 07dbe6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.cs b/src/Uno.Wasm.Bootstrap/ShellTask.cs
@@ -1022,7 +1022,7 @@ private void RunPackager()
 					linkerParams.Add("--keep-metadata all ");
 
 					linkerParams.Add(GetLinkerFeatureConfiguration());
-					linkerParams.Add($"--verbose -b true -a \"{assemblyPath}\" -d \"{_managedPath}\"");
+					linkerParams.Add($"--verbose -b true -a \"{assemblyPath}\" entrypoint -d \"{_managedPath}\"");
 					linkerParams.Add($"-out \"{_managedPath}\"");
 
 					File.WriteAllLines(linkerResponse, linkerParams);

diff --git a/src/Uno.Wasm.Packager/packager.cs b/src/Uno.Wasm.Packager/packager.cs
@@ -1930,7 +1930,7 @@ int Run (string[] args) {
 			} else {
 				foreach (var assembly in root_assemblies) {
 					string filename = Path.GetFileName (assembly);
-					linker_args.Add($"-a linker-in/{filename} ");
+					linker_args.Add($"-a linker-in/{filename} {(IsSupportAssembly(filename) ? string.Empty : "entrypoint")} ");
 				}
 			}
 
@@ -1982,6 +1982,16 @@ private bool IsResourceAssembly(string f, out string culture)
 		return false;
 	}
 
+	private static bool IsSupportAssembly(string filename)
+		=>
+			filename switch
+			{
+				"Uno.Wasm.AotProfiler.dll" => true,
+				"Uno.Wasm.LogProfiler.dll" => true,
+				"Uno.Wasm.MetadataUpdater.dll" => true,
+				_ => false
+			};
+
 	static void CopyFile(string sourceFileName, string destFileName, CopyType copyType, string typeFile = "")
 	{
 		Console.WriteLine($"{typeFile}cp: {copyType} - {sourceFileName} -> {destFileName}");