Skip to content

Drop JVM-only Java.Interop test runs #12894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonrozsival merged 3 commits into from
Oct 6, 2026
Merged

Drop JVM-only Java.Interop test runs #12894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24ea425
Drop JVM-only Java.Interop test runs
simonrozsival Oct 5, 2026
86016fa
Reuse built-in marshaler in attribute test
simonrozsival Oct 5, 2026
7602e7b
Keep test roots at project evaluation
simonrozsival Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/skills/tests/references/test-catalog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ Device: **Yes**

The `Mono.Android.NET-Tests.csproj` dynamically excludes categories based on runtime:
- **CoreCLR runtime**: Excludes `CoreCLRIgnore`, `NTLM`
- **NativeAOT runtime**: Excludes `NativeAOTIgnore`, `SSL`, `NTLM`; excludes `Export` only when the trimmable typemap is off
- **Trimmable typemap**: Excludes `NativeTypeMap`, `TrimmableTypeMapUnsupported`
- **NativeAOT runtime**: Excludes `NativeAOTIgnore`, `SSL`, `NTLM`

Other categories: `SSL`, `InetAccess`, `JavaList`, `RuntimeConfig`, `Intune`, `NTLM`

Expand Down
12 changes: 0 additions & 12 deletions build-tools/automation/azure-pipelines-internal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,18 +820,6 @@ extends:
parameters:
condition: true

# Java.Interop Tests Stage
- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
parameters:
windowsPool:
name: $(NetCoreInternalPoolName)
image: $(WindowsPoolImageNetCoreInternal)
os: windows
macPool:
name: Azure Pipelines
vmImage: $(HostedMacImage)
os: macOS

# MAUI Tests Stage
- stage: maui_tests
displayName: MAUI Tests
Expand Down
14 changes: 0 additions & 14 deletions build-tools/automation/azure-pipelines-public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,20 +432,6 @@ stages:
parameters:
condition: true

# Java.Interop Tests Stage
- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
parameters:
windowsPool:
name: $(NetCorePublicPoolName)
demands:
- ImageOverride -equals $(WindowsPoolImageNetCorePublic)
os: windows
macPool:
name: AcesShared
demands:
- ImageOverride -equals ACES_VM_SharedPool_Tahoe
os: macOS

# Android Tools Tests Stage
- template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
parameters:
Expand Down
11 changes: 0 additions & 11 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,6 @@ extends:
parameters:
usesCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}

- template: /build-tools/automation/yaml-templates/stage-java-interop-tests.yaml@self
parameters:
# The internal Xamarin.Android pipeline uses 1ES Pipeline Templates, which
# require Windows jobs to run on a 1ES-hosted pool. macOS is fine on the
# hosted Azure Pipelines pool as long as `os: macOS` is set (which is now
# the template default).
windowsPool:
name: MAUI-1ESPT
image: $(WindowsPoolImage1ESPT)
os: windows

- template: /build-tools/automation/yaml-templates/stage-xamarin-android-tools-tests.yaml@self
parameters:
use1ESTemplate: true
Expand Down
131 changes: 0 additions & 131 deletions build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions external/Java.Interop/tests/Java.Interop-Tests/Java.Interop-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,16 @@
</ItemGroup>

<ItemGroup>
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AnotherJavaInterfaceImpl.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CrossReferenceBridge.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualBase.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallNonvirtualDerived2.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\FieldRemapBase.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\FieldRemapDerived.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\FieldRemapRenamedBase.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallVirtualFromConstructorBase.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\CallVirtualFromConstructorDerived.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\GetThis.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\JavaInterface.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\MyJavaInterfaceImpl.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\ObjectHelper.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassBase1.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassBase2.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RenameClassDerived.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\AndroidInterface.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\DesugarAndroidInterface$_CC.java" />
<JavaInteropTestJar Include="$(MSBuildThisFileDirectory)java\net\dot\jni\test\RegisterNativesTestType.java" />
Expand Down
55 changes: 0 additions & 55 deletions ...rnal/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions ...l/Java.Interop/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs
View file
Open in desktop

This file was deleted.

Loading
Loading