Skip to content

Conversation

@rolfbjarne
Copy link
Member

Add support for ACToolPath, IBToolPath and TextureAtlasPath to specify the location
of the corresponding executables.

And if not specified, then locate these executables using xcrun.

Also make these process invocations cancellable.

Add support for ACToolPath, IBToolPath and TextureAtlasPath to specify the location
of the corresponding executables.

And if not specified, then locate these executables using `xcrun`.

Also make these process invocations cancellable.
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request refactors the Xcode tool invocation mechanism for ACTool, IBTool, and TextureAtlas tasks to support custom tool paths and use xcrun as the default tool locator.

Changes:

  • Replaced the ToolExe property mechanism with the GetExecutable helper that uses xcrun by default or a custom path when specified
  • Added cancellation support to the tool execution by implementing ICancelableTask in base classes
  • Simplified the tool location logic by removing the DefaultBinDir and related directory properties

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
msbuild/Xamarin.Shared/Xamarin.Shared.targets Removed ToolExe parameters from IBTool, ACTool, and TextureAtlas task invocations
msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeTool.cs Removed ToolExe property and directory-based tool location logic; added ICancelableTask implementation with cancellation support; updated to use GetExecutable helper
msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs Removed ToolExe property and directory properties; added ICancelableTask implementation; refactored arch workaround to work with GetExecutable; fixed typo "looged" → "logged"
msbuild/Xamarin.MacDev.Tasks/Tasks/TextureAtlas.cs Removed DefaultBinDir property, redundant ICancelableTask interface, and Cancel() method (now inherited from base class)
msbuild/Xamarin.MacDev.Tasks/Tasks/IBTool.cs Removed DefaultBinDir property, redundant ICancelableTask interface, and Cancel() method (now inherited from base class)
msbuild/Xamarin.MacDev.Tasks/Tasks/ACTool.cs Removed DefaultBinDir property, redundant ICancelableTask interface, and Cancel() method (now inherited from base class)
docs/building-apps/build-properties.md Added documentation for ACToolPath, IBToolPath, and TextureAtlasPath properties

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build #309d553] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build #309d553] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #309d553] Tests on macOS M1 - Mac Monterey (12) passed 💻

All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #309d553] Tests on macOS M1 - Mac Ventura (13) passed 💻

All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #309d553] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

All tests on macOS arm64 - Mac Sequoia (15) passed.

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #309d553] Tests on macOS X64 - Mac Sonoma (14) passed 💻

All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #309d553] Tests on macOS arm64 - Mac Tahoe (26) passed 💻

All tests on macOS arm64 - Mac Tahoe (26) passed.

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [PR Build #309d553] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

NET (empty diffs)

✅ API diff vs stable

NET (empty diffs)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build #309d553] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 126 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. [attempt 3] Html Report (VSDrops) Download
✅ linker: All 44 tests passed. [attempt 4] Html Report (VSDrops) Download
✅ monotouch (iOS): All 9 tests passed. [attempt 3] Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 15 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ windows: All 3 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. [attempt 3] Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 309d553425bd91aef3eb10655e2eb7ee292c1f0e [PR build]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants