Bump external/Java.Interop from e382113 to b881d21 - #11609

Merged
jonathanpeppers merged 5 commits into
mainfrom
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged

Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom
dependabot/submodules/external/Java.Interop-b881d21

Conversation

@dependabot

@dependabotdependabotBot commented on behalf of githubJun 9, 2026

Copy link
Copy Markdown
Contributor

Bumps external/Java.Interop from e382113 to b881d21.

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot added dependencies Pull requests that update a dependency file. submodules Pull requests that update Submodules code labels Jun 9, 2026
@dependabotdependabotBot added dependencies Pull requests that update a dependency file. submodules Pull requests that update Submodules code labels Jun 9, 2026
@dependabotdependabotBot mentioned this pull request Jun 9, 2026
Closed
jonathanpeppersand others added 2 commits June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers

jonathanpeppers commented Jun 9, 2026

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelinesBot commented Jun 9, 2026

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

dependabotBotand others added 2 commits June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers merged commit 7a43488 into mainJun 10, 2026
38 of 41 checks passed
@jonathanpeppers
jonathanpeppers deleted the dependabot/submodules/external/Java.Interop-b881d21 branch June 10, 2026 00:03
@jonathanpeppersjonathanpeppers mentioned this pull request Jun 10, 2026
Merged
jonathanpeppers added a commit that referenced this pull request Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees

No one assigned

Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Bump external/Java.Interop from e382113 to b881d21 - #11609
Merged
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Jun 10, 2026
Merged
Bump external/Java.Interop from e382113 to b881d21#11609
jonathanpeppers merged 5 commits into
mainfrom 
dependabot/submodules/external/Java.Interop-b881d21
Conversation
@dependabot
@dependabotdependabotBot
commented
on behalf of githubJun 9, 2026

Copy link


Copy Markdown

Contributor
Bumps external/Java.Interop from e382113 to b881d21.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot
Bump external/Java.Interop from e382113 to b881d21
555d70e
Bumps [external/Java.Interop](https://github.com/dotnet/java-interop) from `e382113` to `b881d21`.
- [Commits](dotnet/java-interop@e382113...b881d21)
---
updated-dependencies:
- dependency-name: external/Java.Interop
dependency-version: b881d21f51cbac6e175de1b2f6c254fe3846aa1d
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
added

dependencies
Pull requests that update a dependency file.
submodules
Pull requests that update Submodules code
labels
Jun 9, 2026
@dependabotdependabotBot
mentioned this pull request
Jun 9, 2026
 Closed

jonathanpeppersand others
added 2 commits
June 9, 2026 14:28
@jonathanpeppers@vs-mobiletools-engineering-service2
[NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims (#11616)
0b72f71
* Localized file check-in by OneLocBuild Task (#11610)
Build definition ID 17928: Build ID 14320800
* [xaprepare] Check in `Mono.Android.Apis.projitems`, remove generator (#11608)
`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.
Changes:
* Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
the generator's output byte-for-byte; only the header comment now
points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
declaring "GENERATED FILE".
* Repoint the 4 importers (`Mono.Android.targets` x2,
`create-installers.targets`, `create-android-api.csproj`,
`Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
`Condition="Exists(...)"` guards — the file is always present now.
* Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
(whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
both become unused).
* Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
`Step_GenerateFiles.cs`.
* Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
`using System.Collections.Generic;`. Keep the NDK constants
(`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
`NdkMinimumAPILegacy32`) — they still have consumers.
* Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
XML-based instructions for adding a new API level.
* Narrow the `build-tools/xaprepare/README.md` blurb for
`BuildAndroidPlatforms.cs` to NDK metadata.
* Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
at the old generated path.
Continues the xaprepare cleanup started in PRs #11568 and #11580.
### [docs] Fix Stable=True/False contradiction in HowToAddNewApiLevel
The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [Xamarin.AndroidTools] Remove dead VS Mac / legacy code (#11607)
Context: after the `android-platform-support` repo was inlined here
(see c22cdcf), `src/Xamarin.AndroidTools/` carries a large amount of
code that was only used by old VS Mac / installer / debugger-host
workflows that are no longer part of the .NET for Android product. None
of these types have callers anywhere in this repo, in
`external/xamarin-android-tools/`, or in `external/Java.Interop/`.
Removed (13 files):
* `PublicationUtilities/PublishAndroidApplication.cs`
* `PublicationUtilities/PackageSigningTasks.cs`
* `PublicationUtilities/KeyManagement.cs`
* `PublicationUtilities/KeystoreEntry.cs`
* `Sessions/AndroidDeploySession.cs`
* `Sessions/AndroidConnectCommandSession.cs`
* `Sessions/AndroidCommandSession.cs`
* `Sessions/AndroidDeploymentException.cs`
* `Devices/AndroidPackageList.cs`
* `Devices/AndroidPackageListExtensions.cs`
* `Debugging/MonoDroidProcessMonitor.cs`
* `PlatformPackage.cs`
* `IProgressNotifier.cs`
* `AndroidSigningOptions.cs`
Moved (still needed by `ProcessUtils.cs`):
* `PublicationUtilities/AndroidSdkToolException.cs` ->
`AndroidSdkToolException.cs` (namespace unchanged)
Pruned from `Devices/AndroidDeviceExtensions.cs` (the methods only
referenced the just-deleted types and had no in-tree callers):
* `StartActivityWithCommandSession` (used `AndroidCommandSession`)
* `GetDeploySession`, `GetPackagesAsync`, `GetPackages` (used
`AndroidDeploySession` / `IProgressNotifier`)
* `InstallSharedRuntime*` and `InstallSharedPlatform*` overloads
that took `IProgressNotifier`
* `GetPackageRemotePath`/`GetPackageRemotePathAsync` (used
`AndroidDeploymentException`)
* `GetFastDevRemotePath`/`GetFastDevRemotePathAsync` and the inner
`FastDevRemotePathInfo` class (only consumer was
`GetPackageRemotePathAsync`)
Kept methods in `AndroidDeviceExtensions.cs` are the ones still used
by `Xamarin.Android.Build.Debugging.Tasks` (`EnsureProperties`,
`KillProcessAndWaitForExit`, `PushAndInstallPackageAsync`) and by
`DebuggingExtensions` (`SetFastDevPropertyFile`, `GetProcessIDAsync`,
`SetDebugPropertiesAsync`).
Also cleaned up:
* `Properties/Resources.resx` (English source): removed seven
`CreateKeyError_*` strings that only `KeyManagement.cs` used.
* `Properties/Resources.Designer.cs`: removed the seven matching
properties.
* `MonoDroidSdk.cs`: two `[Obsolete]` messages referenced the
now-deleted `PlatformPackage`; changed to `"Do not use."`.
Non-English `Resources.*.resx` and `Localize/loc/**/*.lcl` are left
alone per repo policy (auto-regenerated by OneLocBuild).
Build verified locally:
* `src/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj`
* `src/Mono.AndroidTools/Mono.AndroidTools.csproj`
* `src/Xamarin.Android.Build.Debugging.Tasks/Xamarin.Android.Build.Debugging.Tasks.csproj`
* `src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK.csproj`
Net change: -4225 / +2 lines across 19 files.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* [NUnitLite] Add OneTimeSetUp/OneTimeTearDown attribute shims
NUnit 3.x renamed [TestFixtureSetUp]/[TestFixtureTearDown] to [OneTimeSetUp]/[OneTimeTearDown]. dotnet/java-interop#1437 migrated the Java.Interop test suite to the new names.
The bundled Xamarin.Android.NUnitLite (src-ThirdParty/NUnitLite/) only defines the legacy names. Add no-op subclasses for the new names so test source using [OneTimeSetUp]/[OneTimeTearDown] still compiles against bundled NUnitLite once the Java.Interop submodule is bumped past dotnet/java-interop#1437.
These shims become unnecessary once dotnet/android moves off bundled NUnitLite to stock NUnit (tracked in PR #11224).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: VS MobileTools Engineering Service 2 <vsmobiletoolsengsvc2@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
95dfc79
…b881d21
@jonathanpeppers
jonathanpeppers
commented
Jun 9, 2026

Copy link


Copy Markdown

Member
/azp run
@azure-pipelines
azure-pipelinesBot
commented
Jun 9, 2026

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
dependabotBotand others
added 2 commits
June 9, 2026 15:59
@dependabot@jonathanpeppers
Bump Irony from 1.1.0 to 1.5.3 (#11561)
2d73b29
---
updated-dependencies:
- dependency-name: Irony
dependency-version: 1.5.3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
@jonathanpeppers
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
a96223b
…b881d21
@jonathanpeppers
jonathanpeppers
merged commit 7a43488
into
mainJun 10, 2026

38 of 41 checks passed

@jonathanpeppers
jonathanpeppers
deleted the

dependabot/submodules/external/Java.Interop-b881d21

branch
June 10, 2026 00:03
@jonathanpeppersjonathanpeppers
mentioned this pull request
Jun 10, 2026
 Merged

jonathanpeppers added a commit
that referenced
this pull request
Jun 10, 2026
@jonathanpeppers
[tests] Dogfooddotnet testfor device tests (#11224)
7ca2231
## Summary
Migrate Mono.Android device test infrastructure from the legacy NUnitLite stack to `dotnet test` with the Microsoft Testing Platform (MTP), following the pattern established for the `androidtest` template in 031246d.
Callers now run device tests with stock `dotnet test`, no custom MSBuild targets required. **NUnitLite is removed entirely** from the workload — both as a framework assembly and as a vendored copy.
## Changes
### New: MTP-based `TestInstrumentation` base class
- `tests/TestRunner.Core/TestInstrumentation.cs` is now an MTP-based on-device runner using stock NUnit (`NUnitTestAssemblyRunner`) plus `Microsoft.Testing.Platform`.
- Mirrors the `androidtest` template: tests run synchronously on the instrumentation thread (`NumberOfTestWorkers = 0`, see comment in code), TRX is written to the app data dir, and the path is sent back through the instrumentation bundle so the host adapter can pick it up.
### Updated test projects
- **Mono.Android.NET-Tests**, **Java.Interop-Tests**, **JcwGen-Tests**: now reference stock NUnit `3.13.3` from NuGet (no NUnitLite / TestRunner.NUnit), set `IsTestingPlatformApplication=true`, and use the new `TestInstrumentation` base.
### Deleted (~41K lines)
- `src/Xamarin.Android.NUnitLite/` — the `Xamarin.Android.NUnitLite.dll` framework assembly (NUnitLite wrapper, `TestSuiteInstrumentation`, GUI `TestSuiteActivity` / `TestResultActivity` / `OptionsActivity`, layouts).
- `src-ThirdParty/NUnitLite/` — the embedded NUnitLite source we used to compile into the above.
- `tests/TestRunner.NUnit/` — `NUnitTestRunner` / `NUnitTestInstrumentation`.
- `tests/TestRunner.xUnit/` — `XUnitTestRunner` / `XUnitTestInstrumentation`.
- `Xamarin.Android.NUnitLite.dll/.pdb/.xml` removed from `build-tools/installers/create-installers.targets` (no longer shipped in the framework).
- Various custom `RunTestApp` / device-test MSBuild targets.
The `XA4313` deprecation message in `Common.targets` (which suggested customers migrate `Xamarin.Android.NUnitLite` → `Xamarin.Legacy.NUnitLite`) is preserved as the existing escape hatch; the `Xamarin.Legacy.NUnitLite` NuGet is published from a separate repo and is unaffected by these changes.
### NativeAOT trimmer fix
NUnit 3.13.3's `EquatablesComparer` walks every value via reflection: `type.GetInterfaceMap(typeof(IEquatable<T>))` then `MethodInfo.Invoke` on the result. Under stock NativeAOT this throws `Arg_NotSupportedException` because ILC strips the dispatch-slot mapping. NUnit 3.14+ guards this with try/catch, but we cannot bump globally (it regresses the Mono Interpreter `AwaitAdapter` lane).
Real fix, no `[Category("NativeAOTIgnore")]` shortcuts:
- `tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj`: under `'$(PublishAot)' == 'true'`, set `<IlcGenerateCompleteTypeMetadata>true</IlcGenerateCompleteTypeMetadata>` and pull in a new `NativeAOT.rd.xml`.
- `tests/Mono.Android-Tests/Mono.Android-Tests/NativeAOT.rd.xml` roots the closed `IEquatable<T>` instantiations the test value types need (`String`, `Boolean`, `IntPtr`, `TimeSpan`, `DateTime`) plus the concrete types themselves as `Dynamic="Required All"`, so ILC keeps the slot mapping. Also roots `TaskAwaitAdapter+GenericAdapter<VoidTaskResult>` for NUnit's async adapter.
Result on CI build [14325032](https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=14325032): NativeAOT lane 230 passed / 0 failed (43 legitimate category exclusions).
### CI updates (`apk-instrumentation.yaml`)
- Build with `-t:Install`, run with `dotnet test --no-build --report-trx`.
- Test results are published as VSTest (TRX) instead of NUnit XML.
- Added `adb logcat -d` capture so device-test crashes can be diagnosed without re-running CI.
### Test fixes / bookkeeping
- Centralized `JavaSystem.LoadLibrary ("reuse-threads")` in `TestInstrumentation.OnCreate` so it runs on the main Java thread instead of inside individual tests.
- Synced `ExcludedTestNames` / `ExcludedCategories` to match `main`.
## Out of scope
- `EmbeddedDSO` and `Locale-Tests` — old-style csproj that still `<Reference Include="Xamarin.Android.NUnitLite" />`. They need an SDK migration before this PR can fully delete that assembly's identity from the build (the `XA4313` deprecation will fire on these projects today). Tracked separately.
## Already split out
These improvements were carved out of this PR and merged separately to `main`:
- #11614 — `[tests] Use Android.Util.Log in JnienvTest.ThreadReuse callback`
- #11615 — `[tests] Improve DoNotLeakWeakReferences reliability`
- #11609 — `Bump to dotnet/java-interop@b881d21` — picks up dotnet/java-interop#1437 (modernize NUnit attributes), which is why no `NUnitCompatibility.cs` shim is needed in this PR.
## Related
- Template work: 031246d
- #11523 — fixed `UrlEscaping_Bug43411` on `main` (test had been silently dead under NUnitLite)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Jul 10, 2026
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner

Assignees


No one assigned


Labels

dependenciesPull requests that update a dependency file.submodulesPull requests that update Submodules code

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@jonathanpeppers