Skip to content

[msbuild] Simplify DetectSdkLocation to not detect whether we're building for the simulator or not.#24514

Merged
rolfbjarne merged 1 commit intomainfrom
dev/rolf/msbuild-detectsdklocation-issimulator
Jan 16, 2026
Merged

[msbuild] Simplify DetectSdkLocation to not detect whether we're building for the simulator or not.#24514
rolfbjarne merged 1 commit intomainfrom
dev/rolf/msbuild-detectsdklocation-issimulator

Conversation

@rolfbjarne
Copy link
Member

We already know if we're building for the simulator or not when calling the
DetectSdkLocation task, so just tell it.

…ding for the simulator or not.

We already know if we're building for the simulator or not when calling the
DetectSdkLocation task, so just tell it.
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 PR simplifies the DetectSdkLocation MSBuild task by removing the logic that detects whether a build is for a simulator or device. Instead, the task now receives SdkIsSimulator as an input parameter since this information is already known from the runtime identifier earlier in the build process.

Changes:

  • Removed internal simulator detection logic from DetectSdkLocation task that parsed TargetArchitectures and IsDotNetSimulatorBuild
  • Changed SdkIsSimulator from an output parameter to a required input parameter
  • Removed obsolete _IsDotNetSimulatorBuild property group that was redundant with SdkIsSimulator

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs Converted SdkIsSimulator from output to required input, removed SetIsSimulator() method and unused TargetArchitectures/IsDotNetSimulatorBuild inputs
msbuild/Xamarin.Shared/Xamarin.Shared.targets Removed TargetArchitectures and IsDotNetSimulatorBuild inputs to DetectSdkLocations task, changed to pass SdkIsSimulator as input instead of receiving it as output
dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets Removed obsolete _IsDotNetSimulatorBuild property group and updated ComputedPlatform to use SdkIsSimulator directly

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build #9afb67c] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [PR Build #9afb67c] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build #9afb67c] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

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

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

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

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

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

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

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

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

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

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [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: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@rolfbjarne rolfbjarne enabled auto-merge (squash) January 16, 2026 09:22
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build #9afb67c] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 117 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. 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. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 9 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ windows: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 9afb67ca5af752b43d60f072fea19a797d71089f [PR build]

@rolfbjarne rolfbjarne merged commit af05b67 into main Jan 16, 2026
50 of 51 checks passed
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