From f8749ea80f7cea2a1494112f2eb21b553c6a737f Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 4 May 2026 17:22:50 +0200
Subject: [PATCH] Use TrimmerRootAssembly for StartupHook test root

Replace the dedicated StartupHookRoots.xml descriptor with a conditional TrimmerRootAssembly item, matching the rest of the test project roots and avoiding a single-purpose descriptor file.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Mono.Android-Tests/Mono.Android.NET-Tests.csproj         | 2 +-
 .../Mono.Android-Tests/StartupHookRoots.xml                  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 tests/Mono.Android-Tests/Mono.Android-Tests/StartupHookRoots.xml

diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
index 6b686ecb8a6..f1575d1e45d 100644
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -76,8 +76,8 @@
   <ItemGroup>
     <TrimmerRootAssembly Include="Mono.Android.NET-Tests" RootMode="Visible" Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' " />
     <TrimmerRootAssembly Include="Java.Interop-Tests" RootMode="Visible" Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' " />
+    <TrimmerRootAssembly Include="StartupHook" RootMode="All" Condition=" '$(StartupHookSupport)' == 'true' " />
     <TrimmerRootDescriptor Include="TrimmerRoots.xml" Condition=" '$(_AndroidTypeMapImplementation)' == 'trimmable' " />
-    <TrimmerRootDescriptor Include="StartupHookRoots.xml" Condition=" '$(StartupHookSupport)' == 'true' " />
     <_AndroidRemapMembers Include="Remaps.xml" />
     <_AndroidRemapMembers Include="IsAssignableFromRemaps.xml" Condition=" '$(_AndroidIsAssignableFromCheck)' == 'false' " />
     <ProguardConfiguration Include="proguard.cfg" />
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/StartupHookRoots.xml b/tests/Mono.Android-Tests/Mono.Android-Tests/StartupHookRoots.xml
deleted file mode 100644
index 59a0ba9e565..00000000000
--- a/tests/Mono.Android-Tests/Mono.Android-Tests/StartupHookRoots.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<linker>
-  <assembly fullname="StartupHook">
-    <type fullname="StartupHook" preserve="all" />
-  </assembly>
-</linker>