Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@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

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800 - #11610

Merged
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33
Jun 9, 2026
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 14320800#11610
jonathanpeppers merged 1 commit into
mainfrom
locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33

Conversation

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@jonathanpeppers
jonathanpeppers merged commit f3b33a3 into mainJun 9, 2026
2 of 3 checks passed
@jonathanpeppers
jonathanpeppers deleted the locpr/4a4d7772-d48d-4a8e-ba95-a3cd92a55b33 branch June 9, 2026 13:18
jonathanpeppers added a commit that referenced this pull request Jun 9, 2026
* 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>
@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.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vs-mobiletools-engineering-service2@jonathanpeppers