[src] Consume ADR from a NuGet instead of building it ourselves. #24381
+57
−203
Conversation
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
This also allows us to remove: * All the logic to conditionally include closed source code (aka ENABLE_XAMARIN) * The logic to handle non-submodule dependencies (because there are none left).
Contributor
There was a problem hiding this comment.
Pull request overview
This PR modernizes the build system by consuming the Apple Doc Reader (ADR) tool from a NuGet package instead of building it from source. This change enables removal of all logic for conditionally including closed-source code (the ENABLE_XAMARIN flag) and handling non-submodule dependencies, significantly simplifying the build configuration.
Key Changes
- ADR is now downloaded as a platform-specific NuGet package (
AppleDocReader.osx-arm64orAppleDocReader.osx-x64) - Removed
ENABLE_XAMARINandENABLE_ADRconfiguration flags throughout the codebase - Simplified build scripts by removing dependency checkout/version management logic
Reviewed changes
Copilot reviewed 20 out of 20 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/mlaunch/README.md | Updated documentation to reflect that mlaunch is closed source with a new repository location |
| tools/adr/README.md | Added new documentation explaining ADR is a closed-source tool with repository location |
| tools/adr/download-adr.csproj | New project file to download ADR NuGet package using PackageDownload |
| tools/adr/Makefile | New Makefile to orchestrate ADR NuGet download via dotnet restore |
| tools/adr/.gitignore | Ignores stamp files generated during the build process |
| src/Makefile | Replaced conditional ADR build logic with direct invocation of NuGet-downloaded ADR tool |
| mk/xamarin.mk | Removed extensive dependency checkout/versioning logic, now only defines NuGet versions |
| mk/versions.mk | Removed bump-current-maccore and bump-current-adr targets |
| Make.config | Added runtime identifier detection logic for osx-arm64 vs osx-x64, removed ADR_PATH |
| configure | Updated to print deprecation message for --enable-xamarin and --disable-xamarin flags |
| create-make-config.sh | Removed auto-detection of macios-adr repository |
| Makefile | Simplified git-clean-all target by removing dependency directory cleanup |
| tests/Makefile | Removed ENABLE_XAMARIN and ENABLE_ADR from test configuration files |
| tests/common/Configuration.cs | Removed EnableXamarin and EnableAdr properties |
| tests/common/ConfigurationNUnit.cs | Removed IgnoreIfNotXamarinEnabled helper method |
| tests/cecil-tests/Documentation.cs | Removed conditional test skipping based on Xamarin/ADR enablement |
| tools/compare-commits.sh | Removed logic to copy ADR from existing clone |
| tools/devops/automation/templates/build/build.yml | Replaced configure-build.sh script with direct configure call |
| tools/devops/automation/scripts/bash/configure-build.sh | Deleted (no longer needed) |
| tools/devops/automation/templates/tests/build.yml | Removed --enable-xamarin from ARGS array initialization |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Collaborator
🔥 [CI Build #a0eacb7] Build failed (Build packages) 🔥Build failed for the job 'Build packages' (with job status 'Failed') Pipeline on Agent |
Collaborator
🔥 [PR Build #a0eacb7] Build failed (Detect API changes) 🔥Build failed for the job 'Detect API changes' (with job status 'Failed') Pipeline on Agent |
Collaborator
|
🔥 Unable to find the contents for the comment: D:\a\1\s\change-detection\results\gh-comment.md does not exist :fire Pipeline on Agent |
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.
This also allows us to remove: