Uh oh!
There was an error while loading. Please reload this page.
[xaprepare] Delete Configuration.OperatingSystem.props generator and xaprepare project - #11959
Merged
Merged
Conversation
…xaprepare project Follow-up to #11956 (which moved the JDK half of `Configuration.OperatingSystem.props` to Java.Interop's `JdkInfo.props`). The remaining NDK/OS-info half has zero real consumers, so this change removes the last generator, cascades through the two Scenarios that only existed to run it, and deletes the whole `build-tools/xaprepare/` project. Every integration point (Makefile, PrepareWindows.targets, CI YAML, docs) is updated in the same commit so `build.cmd -t:Prepare` and `make prepare` still work end-to-end. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR completes the xaprepare teardown by deleting the remaining Configuration.OperatingSystem.props generator (and its now-dead scenario/OS/tooling scaffolding), removing the entire build-tools/xaprepare/ project, and updating build/CI/docs so make prepare / build.cmd -t:Prepare continue to work without xaprepare.
Changes:
- Remove generation + import of
Configuration.OperatingSystem.props, and drop the unusedMakeConcurrencyMSBuild property. - Delete the
build-tools/xaprepare/project tree and the supporting scenario/OS/tool-runner/config code that only existed for xaprepare. - Update Makefile/Windows Prepare target/CI YAML templates and docs to remove xaprepare integration points and point at
src/androidsdk/androidsdk.targets/androidsdk.csprojfor platform provisioning.
Reviewed changes
Copilot reviewed 101 out of 102 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| Makefile | Removes xaprepare invocation/flags from prepare and deletes prepare-help. |
| Documentation/workflow/HowToAddNewApiLevel.md | Updates “add platform” guidance to edit src/androidsdk/androidsdk.targets and uses src/androidsdk/androidsdk.csproj to install platforms. |
| Documentation/building/unix/dependencies.md | Repoints “current JDK version” reference to $(MicrosoftOpenJDKVersion) in Configuration.props. |
| Documentation/building/configuration.md | Removes the $(MakeConcurrency) documentation entry. |
| Configuration.props | Drops OS-props import and the MakeConcurrency definition; retains only JdkInfo import + related comments. |
| build-tools/xaprepare/xaprepare/xaprepare.targets | Deleted (xaprepare build-time file generation targets removed). |
| build-tools/xaprepare/xaprepare/xaprepare.csproj | Deleted (xaprepare app project removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/ToolRunner.OutputSink.cs | Deleted (xaprepare tool-runner logging sink removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/ToolRunner.cs | Deleted (xaprepare tool-runner base removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/TarRunner.OutputSink.cs | Deleted (xaprepare tar runner removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/TarRunner.cs | Deleted (xaprepare tar runner removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/SevenZipRunner.OutputSink.cs | Deleted (xaprepare 7zip runner removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/SevenZipRunner.cs | Deleted (xaprepare 7zip runner removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.OutputSink.cs | Deleted (xaprepare git runner removed). |
| build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.cs | Deleted (xaprepare git runner removed). |
| build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs | Deleted (last generator for Configuration.OperatingSystem.props removed). |
| build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs | Deleted (scenario now empty post-generator removal). |
| build-tools/xaprepare/xaprepare/Scenarios/Scenario_Required.cs | Deleted (scenario now empty post-generator removal). |
| build-tools/xaprepare/xaprepare/Resources/Configuration.OperatingSystem.props.in | Deleted (last template removed). |
| build-tools/xaprepare/xaprepare/OperatingSystems/Windows.cs | Deleted (xaprepare OS model removed). |
| build-tools/xaprepare/xaprepare/OperatingSystems/Unix.cs | Deleted (xaprepare OS model removed). |
| build-tools/xaprepare/xaprepare/OperatingSystems/NoOS.cs | Deleted (xaprepare OS model removed). |
| build-tools/xaprepare/xaprepare/OperatingSystems/MacOS.cs | Deleted (xaprepare OS model removed). |
| build-tools/xaprepare/xaprepare/OperatingSystems/Linux.UbuntuCommon.cs | Deleted (xaprepare OS model removed). |
| build-tools/xaprepare/xaprepare/OperatingSystems/Linux.cs | Deleted (xaprepare OS model removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Windows.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/MacOS.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.UbuntuCommon.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Ubuntu.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Mint.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Gentoo.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Fedora.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Arch.cs | Deleted (xaprepare dependency stubs removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs | Deleted (xaprepare configurables removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Unix.cs | Deleted (xaprepare configurables removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.MacOS.cs | Deleted (xaprepare configurables removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Linux.cs | Deleted (xaprepare configurables removed). |
| build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs | Deleted (xaprepare configurables removed). |
| build-tools/xaprepare/xaprepare/BuildInfo.cs.in | Deleted (xaprepare generated build-info removed). |
| build-tools/xaprepare/xaprepare/Application/VersionFetchers.cs | Deleted (xaprepare version parsing infra removed). |
| build-tools/xaprepare/xaprepare/Application/Utilities.Windows.cs | Deleted (xaprepare utilities removed). |
| build-tools/xaprepare/xaprepare/Application/Utilities.Unix.cs | Deleted (xaprepare utilities removed). |
| build-tools/xaprepare/xaprepare/Application/ThumbTwiddler.cs | Deleted (xaprepare TUI/progress UI removed). |
| build-tools/xaprepare/xaprepare/Application/Step.cs | Deleted (xaprepare step infra removed). |
| build-tools/xaprepare/xaprepare/Application/SizeFormatter.cs | Deleted (xaprepare utility removed). |
| build-tools/xaprepare/xaprepare/Application/SimpleActionStep.cs | Deleted (xaprepare step infra removed). |
| build-tools/xaprepare/xaprepare/Application/SevenZipVersionParser.cs | Deleted (xaprepare version parsing removed). |
| build-tools/xaprepare/xaprepare/Application/ScenarioNoScenario.cs | Deleted (xaprepare scenario infra removed). |
| build-tools/xaprepare/xaprepare/Application/ScenarioAttribute.cs | Deleted (xaprepare scenario infra removed). |
| build-tools/xaprepare/xaprepare/Application/Scenario.cs | Deleted (xaprepare scenario infra removed). |
| build-tools/xaprepare/xaprepare/Application/RegexProgramVersionParser.cs | Deleted (xaprepare version parsing removed). |
| build-tools/xaprepare/xaprepare/Application/PropertiesChangedEventArgs.cs | Deleted (xaprepare property infra removed). |
| build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in | Deleted (xaprepare generated defaults removed). |
| build-tools/xaprepare/xaprepare/Application/Properties.cs | Deleted (xaprepare property infra removed). |
| build-tools/xaprepare/xaprepare/Application/ProgramVersionParser.cs | Deleted (xaprepare version parsing removed). |
| build-tools/xaprepare/xaprepare/Application/Program.cs | Deleted (xaprepare dependency infra removed). |
| build-tools/xaprepare/xaprepare/Application/ProcessStandardStreamWrapper.cs | Deleted (xaprepare process output wrapper removed). |
| build-tools/xaprepare/xaprepare/Application/LoggingVerbosity.cs | Deleted (xaprepare logging infra removed). |
| build-tools/xaprepare/xaprepare/Application/Log.Windows.cs | Deleted (xaprepare logging infra removed). |
| build-tools/xaprepare/xaprepare/Application/Log.Unix.cs | Deleted (xaprepare logging infra removed). |
| build-tools/xaprepare/xaprepare/Application/KnownProperties.cs | Deleted (xaprepare property constants removed). |
| build-tools/xaprepare/xaprepare/Application/KnownConditions.cs | Deleted (xaprepare condition constants removed). |
| build-tools/xaprepare/xaprepare/Application/GeneratedPlaceholdersFile.cs | Deleted (xaprepare generator infra removed). |
| build-tools/xaprepare/xaprepare/Application/GeneratedFile.cs | Deleted (xaprepare generator infra removed). |
| build-tools/xaprepare/xaprepare/Application/Extensions.DictionaryOfProgramVersionParser.cs | Deleted (xaprepare helper removed). |
| build-tools/xaprepare/xaprepare/Application/ExecutionMode.cs | Deleted (xaprepare execution-mode infra removed). |
| build-tools/xaprepare/xaprepare/Application/EssentialTools.Unix.cs | Deleted (xaprepare essential tools infra removed). |
| build-tools/xaprepare/xaprepare/Application/EssentialTools.MacOS.cs | Deleted (xaprepare essential tools infra removed). |
| build-tools/xaprepare/xaprepare/Application/EssentialTools.Linux.cs | Deleted (xaprepare essential tools infra removed). |
| build-tools/xaprepare/xaprepare/Application/EssentialTools.cs | Deleted (xaprepare essential tools infra removed). |
| build-tools/xaprepare/xaprepare/Application/DownloadStatus.cs | Deleted (xaprepare download infra removed). |
| build-tools/xaprepare/xaprepare/Application/DetermineWindowsVersion.Windows.cs | Deleted (xaprepare OS detection removed). |
| build-tools/xaprepare/xaprepare/Application/Context.Windows.cs | Deleted (xaprepare context removed). |
| build-tools/xaprepare/xaprepare/Application/Context.MacOS.cs | Deleted (xaprepare context removed). |
| build-tools/xaprepare/xaprepare/Application/Context.Linux.cs | Deleted (xaprepare context removed). |
| build-tools/xaprepare/xaprepare/Application/CompressionFormat.cs | Deleted (xaprepare compression infra removed). |
| build-tools/xaprepare/xaprepare/Application/Characters.cs | Deleted (xaprepare UI chars removed). |
| build-tools/xaprepare/xaprepare/Application/AppObject.cs | Deleted (xaprepare base type removed). |
| build-tools/xaprepare/xaprepare/app.manifest | Deleted (xaprepare Windows manifest removed). |
| build-tools/xaprepare/xaprepare/App.config | Deleted (xaprepare legacy app config removed). |
| build-tools/xaprepare/xaprepare.sln | Deleted (xaprepare solution removed). |
| build-tools/xaprepare/README.md | Deleted (xaprepare documentation removed). |
| build-tools/xaprepare/.gitignore | Deleted (xaprepare-specific ignore file removed). |
| build-tools/scripts/PrepareWindows.targets | Removes xaprepare build/run steps; repoints Prepare to dotnet + bootstrap/workloads + Java.Interop prepare. |
| build-tools/scripts/BuildEverything.mk | Simplifies jenkins to always make prepare && make leeroy. |
| build-tools/automation/yaml-templates/setup-jdk-variables.yaml | Renames internal variable used to compute JAVA_HOME path ($xaPrepareJdkPath → $xaJdkPath). |
| build-tools/automation/yaml-templates/generate-cgmanifest.yaml | Removes stale comment referencing the old xaprepare step. |
| build-tools/automation/yaml-templates/copy-extra-result-files.yaml | Removes collection of the now-deleted Configuration.OperatingSystem.props and tidies comment. |
| build-tools/automation/yaml-templates/commercial-build.yaml | Drops PREPARE_CI=1 from make jenkins invocation. |
| build-tools/automation/yaml-templates/build-macos-steps.yaml | Drops PREPARE_CI=1 from make jenkins invocation. |
| build-tools/automation/yaml-templates/build-linux-steps.yaml | Drops PREPARE_CI=1 from make jenkins invocation. |
| build-tools/automation/azure-pipelines-apidocs.yaml | Drops PREPARE_CI=1 from make prepare invocation. |
| .gitignore | Removes Configuration.OperatingSystem.props ignore entry since it’s no longer generated. |
| .github/workflows/copilot-setup-steps.yml | Drops PREPARE_CI=1 from make jenkins invocation. |
Comments suppressed due to low confidence (1)
Configuration.props:9
- 💡 Maintainability —
DoNotLoadOSPropertiesnow only guards importingJdkInfo.props(sinceConfiguration.OperatingSystem.propswas removed). Adding a short comment here would prevent future confusion about what this switch actually disables.
<Import
Project="$(MSBuildThisFileDirectory)external\Java.Interop\bin\Build$(Configuration)\JdkInfo.props"
Condition=" Exists('$(MSBuildThisFileDirectory)external\Java.Interop\bin\Build$(Configuration)\JdkInfo.props') And '$(DoNotLoadOSProperties)' != 'True' "
/>
Uh oh!
There was an error while loading. Please reload this page.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
xaprepare previously ran `git submodule update` via Step_PrepareExternalGitDependencies + Context.MainAsync's SelectedScenario.NeedsGitSubmodules block. With xaprepare gone, nothing initialized submodules for the `checkout: self` blocks in azure-pipelines-public.yaml, so the Bootstrap solution build failed with MSB4019 trying to import external/xamarin-android-tools/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems. Add `submodules: recursive` to the three `checkout: self` steps (macOS, Windows, Linux) to match azure-pipelines-nightly.yaml, azure-pipelines-apidocs.yaml, azure-pipelines.yaml, and stage-java-interop-tests.yaml (all already set it). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
xaprepare's Context.WriteBuildToolsInventoryCsv() produced bin/Build$(Configuration)/buildtoolsinventory.csv listing the Android SDK/NDK/JDK/dotnet component versions, required by Section 4.e.i.D of the Executive Order on Cybersecurity build system security requirements (per PR #6833). The file is consumed as the AndroidBuildToolsInventory pipeline artifact by build-macos-steps.yaml, build-macos.yaml (1ES), and commercial-build.yaml. With xaprepare gone this file was no longer being generated, so the macOS `upload build tools inventory` task failed with: Path does not exist: .../bin/BuildRelease/buildtoolsinventory.csv Add build-tools/build-tools-inventory/build-tools-inventory.proj which reads the versions from Configuration.props, eng/Versions.props, and the _PlatformPackage ItemGroup in androidsdk.targets (the single sources of truth) and writes the CSV via WriteLinesToFile. Wire it into Makefile `prepare` and PrepareWindows.targets `Prepare` so the file is produced by `make prepare` and `build.cmd -t:Prepare`. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
xaprepare's Step_GenerateCGManifest ran on every CI `make prepare` invocation (because `PREPARE_CI=1` implied `-a` which selected Scenario_Standard). generate-cgmanifest.yaml was wired into build-linux-steps, build-macos-steps, build-windows-steps, and commercial-build, but the internal 1ES apidocs pipeline was missed. Component Governance depends on the manifest for git submodule registrations that its native detectors can't enumerate. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Uh oh!
There was an error while loading. Please reload this page.
jonathanpeppers added a commit
that referenced
this pull request
Jul 16, 2026
## Summary - delete the unused `Android`, `Emulator`, and legacy `JdkInfo` BootstrapTasks - move the one surviving trace logger adapter into `CheckApiCompatibility` - remove BootstrapTasks' `Xamarin.Android.Tools.AndroidSdk` dependency by parsing the three API metadata fields used by `GenerateSupportedPlatforms` directly - delete the redundant `Xamarin.Android.BootstrapTasks.sln` and build BootstrapTasks directly in CI - make `build-tools/scripts/Prepare.proj` the cross-platform source of truth for post-install Prepare orchestration - delete `PrepareWindows.targets` by moving its Windows-only .NET installation and toolchain-path guard into `Prepare.proj` This follows the wholesale xaprepare removal in #11959. ## BootstrapTasks cleanup The deleted `Android` and `Emulator` wrappers had no task registration or invocation. The deleted `JdkInfo` task was superseded by `Java.Interop.BootstrapTasks.JdkInfo`; its only remaining indirect use was a generic logger callback used by `CheckApiCompatibility`. The initial dependency audit also surfaced a narrow surviving use of `AndroidVersion` and `AndroidVersions` in `GenerateSupportedPlatforms`. That task only needed `VersionCodeFull`, target-framework version ordering, and `Stable`, so it now parses those existing item metadata values directly while preserving the prior max-stable and supported-platform ordering semantics. This removes the broader `Xamarin.Android.Tools.AndroidSdk` project reference without duplicating its model. `Xamarin.Android.BootstrapTasks.sln` only contained BootstrapTasks and `xa-prep-tasks`, which is already a BootstrapTasks project reference. Its Makefile, Windows, and Azure Pipelines consumers now use the project/common orchestrator directly. ## Prepare orchestration | Before | After | | --- | --- | | Unix Makefile listed four commands | Unix installs .NET, then invokes `Prepare.proj` once | | `PrepareWindows.targets` installed .NET and listed the same four operations | The solution imports `Prepare.proj`, which installs .NET and checks the toolchain path on Windows | | Java.Interop was called separately by each wrapper | `Prepare.proj` imports `DotNet.targets` and calls the existing `PrepareJavaInterop` target | `Prepare.proj` preserves this order: 1. restore/build BootstrapTasks 2. restore/build workloads 3. run `PrepareJavaInterop` and its `PrepareOpenJDK` dependency 4. build the build-tools inventory The Unix wrapper launches the orchestrator with system `dotnet`; imported `DotNet.targets` continues to use the repo-local `$(DotNetPreviewTool)` for Java.Interop. On Windows, `Prepare.proj` also owns the conditional .NET installation and Android toolchain path guard previously kept in `PrepareWindows.targets`. ## Verification - `dotnet build build-tools\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj -c Debug`: passed, 0 warnings - `build.cmd -t:Prepare -c Debug`: passed end to end - expected outputs confirmed: - `bin\BuildDebug\net10.0\Xamarin.Android.Tools.BootstrapTasks.dll` - `external\Java.Interop\bin\BuildDebug\JdkInfo.props` - `bin\BuildDebug\buildtoolsinventory.csv` - system-`dotnet` invocation of `Prepare.proj`: passed, 0 warnings; binlog inspected with `binlogtool` - `dotnet-local.cmd build src\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj -c Debug`: passed with 17 pre-existing generated-code/Javac warnings - old solution/task/orchestration references: no matches - GNU make was unavailable on the Windows host; the equivalent system-`dotnet` command emitted by `SYSTEM_DOTNET_BINLOG` was run directly instead Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Co-authored-by: Šimon Rozsíval <simon@rozsival.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #11956, which moved the JDK half of
Configuration.OperatingSystem.propsto Java.Interop'sJdkInfo.props. The remaining NDK / OS-info half has zero real consumers, so this PR:Configuration.OperatingSystem.props.in).Step_GenerateFiles, bothScenario_*classes (which now had zero steps), and every supportingOperatingSystems/,Context.*OS.cs,EssentialTools.*,ToolRunners/*,Configurables.*,Application/*, andMain.csfile that only existed to feed the scenarios.build-tools/xaprepare/project.Makefile,PrepareWindows.targets,BuildEverything.mk, CI YAML, docs) sobuild.cmd -t:Prepareandmake preparestill work end-to-end.Configuration.OperatingSystem.props.inplaceholder audit.infileHostOsNameHostOsFlavorHostOsReleaseHostBitsArchiveBase.HostBitsinsrc/Xamarin.Installer.AndroidSDK/is an unrelated C# property)NdkLlvmTag_NdkToolchainOSTaginandroidsdk.targets)HostCpuCountConfiguration.props:72via$(MakeConcurrency)$(MakeConcurrency)auditThe only definition was
Configuration.props:72. A repo-wide grep of.targets,.props,.projitems,Makefile, and.mkfiles found zero consumers of the MSBuild property. TheMakeConcurrencyhits underbuild-tools/xaprepare/were an unrelated C#Context.MakeConcurrencyproperty.Result: dropped the
MakeConcurrencyMSBuild property entirely (no$([System.Environment]::ProcessorCount)replacement needed) and removed the$(MakeConcurrency)bullet inDocumentation/building/configuration.md.xaprepare integration audit (grep-confirmed, patched here)
build-tools/xaprepare/(entire tree)Configuration.props<Import>of the generated OS props, droppedMakeConcurrency, tidied the "between xaprepare and package creation tools" comment.gitignoreConfiguration.OperatingSystem.propsbuild-tools/scripts/PrepareWindows.targets_XAPrepareExe,_XAPrepareStandardArgs,_BuildXAPreparetarget, and theExec dotnet $(_XAPrepareExe)line. RepointedPrepareat_InstallDotNet. Kept the space-in-path guard, BootstrapTasks / workloads MSBuilds, andPrepareJavaInteropMakefilePREPARE_PROJECT,PREPARE_NET_FX,PREPARE_ARGS,PREPARE_MSBUILD_FLAGS,PREPARE_SCENARIO,PREPARE_CI_PR,PREPARE_CI,_PREPARE_CI_MODE_*,_PREPARE_ARGS, and all their conditionals. Dropped thedotnet run --project xaprepare.csprojline fromprepare. Deleted theprepare-helptargetbuild-tools/scripts/BuildEverything.mkjenkinsno longer branches onPREPARE_CI_PR/PREPARE_CI; just$(MAKE) prepare && $(MAKE) leeroy.github/workflows/copilot-setup-steps.ymlPREPARE_CI=1build-tools/automation/azure-pipelines-apidocs.yamlPREPARE_CI=1build-tools/automation/yaml-templates/build-linux-steps.yamlPREPARE_CI=1build-tools/automation/yaml-templates/build-macos-steps.yamlPREPARE_CI=1build-tools/automation/yaml-templates/commercial-build.yamlPREPARE_CI=1build-tools/automation/yaml-templates/copy-extra-result-files.yaml**/Configuration.OperatingSystem.propsglob and the staleStep_CopyExtraResultFilesForCIxaprepare-step commentbuild-tools/automation/yaml-templates/generate-cgmanifest.yamlStep_GenerateCGManifestxaprepare-step commentbuild-tools/automation/yaml-templates/setup-jdk-variables.yaml$xaPrepareJdkPath→$xaJdkPathfor hygieneDocumentation/workflow/HowToAddNewApiLevel.md<_PlatformPackage>entries insrc/androidsdk/androidsdk.targetsinstead ofAndroidToolchain.cs; updated the--android-sdk-platforms=allrecipe todotnet-local build src/androidsdk/androidsdk.csproj -p:AndroidSdkPlatforms=allDocumentation/building/unix/dependencies.md$(MicrosoftOpenJDKVersion)in/Configuration.propsinstead of the deletedConfigurables.csDocumentation/building/configuration.md$(MakeConcurrency)bulletHistorical breadcrumb comments left as-is (still accurate and useful for git-archaeology):
.github/skills/update-tpn/SKILL.mdsrc/AndroidBuildConfig/AndroidBuildConfig.csprojsrc/androidsdk/androidsdk.targetssrc/native/cmake-config/cmake-config.csprojsrc/workloads/workloads.csprojVerification
build.cmd Prepare— succeeded end-to-end on Windows (0 warnings, 0 errors). The trimmedPreparetarget ran through_InstallDotNet, the space-in-path guard,Xamarin.Android.BootstrapTasks.sln,src/workloads/workloads.csproj, andPrepareJavaInterop.dotnet build src\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj -c Debug— 0 errors (93 pre-existing warnings fromsrc/Mono.Android/and generated MCW, unrelated to this change).HostOsName,HostOsFlavor,HostOsRelease,HostCpuCount,NdkLlvmTag, and the MSBuildMakeConcurrencyproperty — clean.xaprepare— clean apart from the five intentional historical breadcrumb comments listed above.Diff stat
102 files changed, 25 insertions(+), 7891 deletions(-).
Precedent chain
Continues the multi-slice teardown started by #11568, #11580, #11608, #11613, #11631, #11731, #11732, #11733, #11737, #11740, #11760, #11803, #11821, #11825, #11826, #11945, #11946, #11956.
Co-authored-by: Copilot App 223556219+Copilot@users.noreply.github.com