[xaprepare] Remove empty Scenario_AndroidTestDependencies and Scenario_EmulatorTestDependencies#11731
Open
jonathanpeppers wants to merge 1 commit into
Open
Conversation
After PR #11636 hollowed out `Scenario_AndroidTestDependencies` and `Scenario_EmulatorTestDependencies`, their `AddSteps()` methods no longer add any steps -- they only set `AllowProgramInstallation=false` and `IgnoreMissingPrograms=true`, which have no effect when no steps run. `Scenario_EmulatorTestDependencies` inherited from the former and added nothing. Delete both vestigial scenarios. Also update the now-obsolete error message in `GradleCLI.cs` that referenced the deleted scenario; Gradle is committed to the repo at `build-tools/gradle/`, so the generic "not found" wording is sufficient. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Removes two vestigial xaprepare scenarios that no longer perform any work post-#11636, and updates a test helper error message that referenced the removed scenario.
Changes:
- Deleted
Scenario_AndroidTestDependenciesandScenario_EmulatorTestDependenciesfromxaprepare. - Updated
GradleCLI’s missing-gradle exception message to remove the staleAndroidTestDependenciesscenario guidance.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/GradleCLI.cs | Updates the FileNotFoundException message to no longer reference a removed xaprepare scenario. |
| build-tools/xaprepare/xaprepare/Scenarios/Scenario_EmulatorTestDependencies.cs | Removes an empty, inherited scenario that added no steps. |
| build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs | Removes an empty scenario whose AddSteps() only set conditions but registered no steps. |
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
After PR #11636 (
Provision .NET SDK via standard scripts, drop xaprepare's installer), theScenario_AndroidTestDependenciesandScenario_EmulatorTestDependenciesxaprepare scenarios are vestigial husks. TheirAddSteps()methods don't callSteps.Add()at all — they only set two conditions (AllowProgramInstallation=false,IgnoreMissingPrograms=true) that affect nothing because no steps run.Scenario_EmulatorTestDependenciesinherited fromScenario_AndroidTestDependenciesand added nothing.Neither scenario is invoked by any Azure DevOps pipeline (
build-tools/automation/), GitHub Actions workflow (.github/),Makefile,build.sh, orbuild.cmd.Changes
build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.csbuild-tools/xaprepare/xaprepare/Scenarios/Scenario_EmulatorTestDependencies.csGradleCLI.csthat referenced the deletedAndroidTestDependenciesscenario. Gradle is committed to the repo atbuild-tools/gradle/, so the generic "not found" wording is sufficient.The
KnownConditionsenum and its consumers (OS.cs,Program.cs,EssentialTools.cs,Context.cs) are intentionally left untouched — those conditions still have defaults and other consumers.Verification
git grep -i AndroidTestDependencies→ 0 matchesgit grep -i EmulatorTestDependencies→ 0 matchesdotnet build build-tools/xaprepare/xaprepare/xaprepare.csproj -c Debug→ 0 warnings, 0 errorsContext
Part of the broader xaprepare-removal campaign: #11568, #11580, #11608, #11613, #11631, #11636, #11657, #11658.
Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com