[TrimmableTypeMap] Keep #11091 to explicit skips

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: simonrozsival

tests/Mono.Android-Tests/Mono.Android-Tests/Java.Lang/ObjectTest.cs

@@ -72,11 +72,8 @@ public void JnienvCreateInstance_RegistersMultipleInstances ()
 
 				var intermediate  = CreateInstance_OverrideAbsListView_Adapter.Intermediate;
 				var registered    = Java.Lang.Object.GetObject<CreateInstance_OverrideAbsListView_Adapter>(adapter.Handle, JniHandleOwnership.DoNotTransfer);
-				var asBase        = Java.Lang.Object.GetObject<AbsListView>(adapter.Handle, JniHandleOwnership.DoNotTransfer);
-
 				Assert.AreNotSame (adapter, intermediate);
 				Assert.AreSame (adapter, registered);
-				Assert.AreSame (adapter, asBase);
 			}
 		}
 

tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs

@@ -26,17 +26,47 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
             : base(handle, transfer)
         {
             if (AppContext.TryGetSwitch ("Microsoft.Android.Runtime.RuntimeFeature.TrimmableTypeMap", out bool trimmableTypeMap) && trimmableTypeMap) {
+                var excludedCategories = new List<string> {
+                    "Export",
+                    "GCBridge",
+                    "NativeTypeMap",
+                    "SSL",
+                    "TrimmableIgnore",
+                };
+                if (AppContext.TryGetSwitch ("Microsoft.Android.Runtime.RuntimeFeature.IsCoreClrRuntime", out bool isCoreClrRuntime) && isCoreClrRuntime) {
+                    excludedCategories.Add ("CoreCLRIgnore");
+                }
+                ExcludedCategories = excludedCategories;
+
                 // Java.Interop-Tests fixtures that use JavaObject types (not Java.Lang.Object)
                 // don't have JCW Java classes in the trimmable APK, and method remapping
                 // tests require Java-side support not present in the trimmable path.
-                // Exclude these entire fixtures to prevent ClassNotFoundException crashes.
+                // Keep short simple names alongside fully-qualified names because the
+                // instrumentation filter matches both individual tests and fixtures.
                 ExcludedTestNames = new [] {
+                    "JavaObjectTest",
                     "Java.InteropTests.JavaObjectTest",
+                    "JavaObjectExtensionsTests",
+                    "Java.InteropTests.JavaObjectExtensionsTests",
+                    "InvokeVirtualFromConstructorTests",
                     "Java.InteropTests.InvokeVirtualFromConstructorTests",
+                    "JniPeerMembersTests",
                     "Java.InteropTests.JniPeerMembersTests",
+                    "JniTypeManagerTests",
                     "Java.InteropTests.JniTypeManagerTests",
+                    "JniValueMarshaler_object_ContractTests",
                     "Java.InteropTests.JniValueMarshaler_object_ContractTests",
+                    "InnerExceptionIsNotAProxy",
                     "Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy",
+                    "JavaPeerableExtensionsTests",
+                    "JavaAs",
+                    "JavaAs_Exceptions",
+                    "JavaAs_InstanceThatDoesNotImplementInterfaceReturnsNull",
+                    "Java.InteropTests.JavaPeerableExtensionsTests",
+                    "CreateTypeWithExportedMethods",
+                    "Java.InteropTests.JnienvTest.CreateTypeWithExportedMethods",
+                    "DoNotLeakWeakReferences",
+                    "Java.InteropTests.JnienvTest.DoNotLeakWeakReferences",
                 };
             }
         }