Uh oh!
There was an error while loading. Please reload this page.
[xaprepare] Remove BuildInfo / GitRunner.Blame orphans left by #11826 - #11945
Merged
Merged
Conversation
Follow-up to #11826. After that PR moved XABuildConfig generation to AndroidBuildConfig.dll and removed instance members from BuildInfo, the entire cascade downstream of `BuildInfo.DetermineLastVersionChangeCommit` became unreachable. Removed: * `Application/BuildInfo.cs` (whole file — all members orphan) * `ToolRunners/GitRunner.BlamePorcelainEntry.cs` (whole file) * `GitRunner` `Blame(...)` overloads (3), `ParseBlameLine`, and now-unused `SetCommandArguments` helper * `Context.BuildInfo` property + assignment in `Init()` * `Utilities.ShortenGitHash` and its only consumer `Configurables.Defaults.AbbreviatedHashLength` `BuildInfo.cs.in` was changed from `partial class` to `static class` since only `XAVersion` remains; `Main.cs` still uses `BuildInfo.XAVersion`. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR continues the incremental removal of xaprepare by deleting an orphaned “build info via git blame” cascade that was left behind after XABuildConfig generation moved out of xaprepare in #11826.
Changes:
- Removed the
GitRunner.Blame(...)implementation and the associated porcelain parser types. - Deleted the now-unused
BuildInfoinstance implementation and removed it fromContext. - Simplified the generated
BuildInfotemplate down to astaticholder forXAVersiononly, and removed the last helper (ShortenGitHash) + its configurable.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.cs | Removes blame API surface and related helpers. |
| build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.BlamePorcelainEntry.cs | Deletes blame porcelain parsing types now made unreachable. |
| build-tools/xaprepare/xaprepare/Application/BuildInfo.cs | Deletes the orphaned BuildInfo instance implementation. |
| build-tools/xaprepare/xaprepare/Application/Context.cs | Removes the BuildInfo property and initialization. |
| build-tools/xaprepare/xaprepare/Application/Utilities.cs | Removes ShortenGitHash helper. |
| build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs | Removes AbbreviatedHashLength constant (no remaining consumers). |
| build-tools/xaprepare/xaprepare/BuildInfo.cs.in | Converts BuildInfo template to a static class with only XAVersion. |
Comments suppressed due to low confidence (1)
build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.cs:218
- Avoid the null-forgiving operator here. With nullable enabled in this project,
workingDirectory!is unnecessary and violates the repo rule to never use!. You can restructure the check to make the non-null flow explicit.
if (!String.IsNullOrEmpty (workingDirectory))
return workingDirectory!;
return BuildPaths.XamarinAndroidSourceRoot;
simonrozsival
approved these changes
Jul 1, 2026
jonathanpeppers
enabled auto-merge (squash)
July 1, 2026 22:22
Uh oh!
There was an error while loading. Please reload this page.
This was referenced Jul 2, 2026
simonrozsival pushed a commit
that referenced
this pull request
Jul 3, 2026
…xaprepare project (#11959) 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 PR: 1. Deletes the last generator template (`Configuration.OperatingSystem.props.in`). 2. Cascades through `Step_GenerateFiles`, both `Scenario_*` classes (which now had zero steps), and every supporting `OperatingSystems/`, `Context.*OS.cs`, `EssentialTools.*`, `ToolRunners/*`, `Configurables.*`, `Application/*`, and `Main.cs` file that only existed to feed the scenarios. 3. Deletes the whole `build-tools/xaprepare/` project. 4. Patches every integration point (`Makefile`, `PrepareWindows.targets`, `BuildEverything.mk`, CI YAML, docs) so `build.cmd -t:Prepare` and `make prepare` still work end-to-end. ## `Configuration.OperatingSystem.props.in` placeholder audit | Placeholder | Consumers outside the `.in` file | Action | | --- | --- | --- | | `HostOsName` | none | drop | | `HostOsFlavor` | none | drop | | `HostOsRelease` | none | drop | | `HostBits` | none (`ArchiveBase.HostBits` in `src/Xamarin.Installer.AndroidSDK/` is an unrelated C# property) | drop | | `NdkLlvmTag` | none (the NDK toolchain OS tag is resolved elsewhere via `_NdkToolchainOSTag` in `androidsdk.targets`) | drop | | `HostCpuCount` | only `Configuration.props:72` via `$(MakeConcurrency)` | drop | ## `$(MakeConcurrency)` audit The only definition was `Configuration.props:72`. A repo-wide grep of `.targets`, `.props`, `.projitems`, `Makefile`, and `.mk` files found zero consumers of the MSBuild property. The `MakeConcurrency` hits under `build-tools/xaprepare/` were an unrelated C# `Context.MakeConcurrency` property. **Result:** dropped the `MakeConcurrency` MSBuild property entirely (no `$([System.Environment]::ProcessorCount)` replacement needed) and removed the `$(MakeConcurrency)` bullet in `Documentation/building/configuration.md`. ## xaprepare integration audit (grep-confirmed, patched here) | Location | Change | | --- | --- | | `build-tools/xaprepare/` (entire tree) | **deleted** — 86 tracked files | | `Configuration.props` | dropped `<Import>` of the generated OS props, dropped `MakeConcurrency`, tidied the "between xaprepare and package creation tools" comment | | `.gitignore` | dropped `Configuration.OperatingSystem.props` | | `build-tools/scripts/PrepareWindows.targets` | removed `_XAPrepareExe`, `_XAPrepareStandardArgs`, `_BuildXAPrepare` target, and the `Exec dotnet $(_XAPrepareExe)` line. Repointed `Prepare` at `_InstallDotNet`. Kept the space-in-path guard, BootstrapTasks / workloads MSBuilds, and `PrepareJavaInterop` | | `Makefile` | dropped `PREPARE_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 the `dotnet run --project xaprepare.csproj` line from `prepare`. Deleted the `prepare-help` target | | `build-tools/scripts/BuildEverything.mk` | `jenkins` no longer branches on `PREPARE_CI_PR`/`PREPARE_CI`; just `$(MAKE) prepare && $(MAKE) leeroy` | | `.github/workflows/copilot-setup-steps.yml` | dropped now-unused `PREPARE_CI=1` | | `build-tools/automation/azure-pipelines-apidocs.yaml` | dropped `PREPARE_CI=1` | | `build-tools/automation/yaml-templates/build-linux-steps.yaml` | dropped `PREPARE_CI=1` | | `build-tools/automation/yaml-templates/build-macos-steps.yaml` | dropped `PREPARE_CI=1` | | `build-tools/automation/yaml-templates/commercial-build.yaml` | dropped `PREPARE_CI=1` | | `build-tools/automation/yaml-templates/copy-extra-result-files.yaml` | dropped `**/Configuration.OperatingSystem.props` glob and the stale `Step_CopyExtraResultFilesForCI` xaprepare-step comment | | `build-tools/automation/yaml-templates/generate-cgmanifest.yaml` | dropped the stale `Step_GenerateCGManifest` xaprepare-step comment | | `build-tools/automation/yaml-templates/setup-jdk-variables.yaml` | renamed `$xaPrepareJdkPath` → `$xaJdkPath` for hygiene | | `Documentation/workflow/HowToAddNewApiLevel.md` | rewrote the "Add New Platform" section to point at `<_PlatformPackage>` entries in `src/androidsdk/androidsdk.targets` instead of `AndroidToolchain.cs`; updated the `--android-sdk-platforms=all` recipe to `dotnet-local build src/androidsdk/androidsdk.csproj -p:AndroidSdkPlatforms=all` | | `Documentation/building/unix/dependencies.md` | JDK-version link now points at `$(MicrosoftOpenJDKVersion)` in `/Configuration.props` instead of the deleted `Configurables.cs` | | `Documentation/building/configuration.md` | removed the `$(MakeConcurrency)` bullet | **Historical breadcrumb comments left as-is** (still accurate and useful for git-archaeology): - `.github/skills/update-tpn/SKILL.md` - `src/AndroidBuildConfig/AndroidBuildConfig.csproj` - `src/androidsdk/androidsdk.targets` - `src/native/cmake-config/cmake-config.csproj` - `src/workloads/workloads.csproj` ## Verification - `build.cmd Prepare` — succeeded end-to-end on Windows (0 warnings, 0 errors). The trimmed `Prepare` target ran through `_InstallDotNet`, the space-in-path guard, `Xamarin.Android.BootstrapTasks.sln`, `src/workloads/workloads.csproj`, and `PrepareJavaInterop`. - `dotnet build src\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj -c Debug` — 0 errors (93 pre-existing warnings from `src/Mono.Android/` and generated MCW, unrelated to this change). - Repo-wide grep for `HostOsName`, `HostOsFlavor`, `HostOsRelease`, `HostCpuCount`, `NdkLlvmTag`, and the MSBuild `MakeConcurrency` property — clean. - Repo-wide grep for `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>
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 #11826, which moved
XABuildConfiggeneration toAndroidBuildConfig.dlland removed the instance members fromBuildInfothat consumed the dead cascade. This PR deletes that cascade — all of it was out-of-scope in the previous PR.Part of the incremental removal of
xaprepare— precedents: #11568, #11580, #11608, #11613, #11631, #11731, #11732, #11733, #11737, #11740, #11760, #11803, #11821, #11825, #11826.What was removed
build-tools/xaprepare/xaprepare/Application/BuildInfo.csDetermineLastVersionChangeCommit,CommitOfLastVersionChange,VersionHash,GetCommitDate,GetTZOffset,CreateGitRunner).build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.BlamePorcelainEntry.csBlameParserState+BlamePorcelainEntryonly referenced by deleted Blame code.build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.csBlame(...)overloads,ParseBlameLine, and the now-unusedSetCommandArgumentshelper.build-tools/xaprepare/xaprepare/Application/Context.csBuildInfoproperty + XML doc +Init()assignment.build-tools/xaprepare/xaprepare/Application/Utilities.csShortenGitHash.build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.csAbbreviatedHashLength— the only consumer wasShortenGitHash.build-tools/xaprepare/xaprepare/BuildInfo.cs.inpartial class BuildInfo→static class BuildInfo. OnlyXAVersionconst remains;Main.csstill uses it.Total: 7 files changed, 1 insertion, 353 deletions.
Audit
Only the intentional
BuildInfo.XAVersionusage inMain.csand the build-system paths remain.Verification
dotnet build build-tools/xaprepare/xaprepare/xaprepare.csproj -c Debug→ 0 warnings, 0 errors.build.cmd -t:Prepare -c Debug→ succeeded.Co-authored-by: Copilot App 223556219+Copilot@users.noreply.github.com