[msbuild/dotnet] Use 'SdkIsSimulator' instead of 'ComputedPlatform'. by rolfbjarne · Pull Request #25234 · dotnet/macios

rolfbjarne · 2026-04-23T12:14:08Z

This simplifies the code, since we only have a single property as the source
of truth whether we're building for the simulator or not.

This simplifies the code, since we only have a single property as the source of truth whether we're building for the simulator or not.

Copilot

Pull request overview

This PR replaces uses of $(ComputedPlatform) with $(SdkIsSimulator) across MSBuild and SDK-style targets to make simulator-vs-device detection rely on a single source of truth.

Changes:

Updated multiple MSBuild target conditions to use $(SdkIsSimulator) instead of $(ComputedPlatform).
Moved/added ComputedPlatform definition into dotnet/targets/Xamarin.Shared.Sdk.props for compatibility with external consumers.
Removed the old ComputedPlatform initialization snippet from Xamarin.Shared.Sdk.DefaultItems.targets.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
tests/monotouch-test/dotnet/shared.csproj	Uses `SdkIsSimulator` for defining `AOT` in test builds.
tests/ComputeRegistrarConstant.targets	Uses `SdkIsSimulator` to compute dynamic registrar constant for iOS/tvOS.
msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets	Uses `SdkIsSimulator` to gate IPA/dSYM copy-back steps from the Mac build host.
msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets	Uses `SdkIsSimulator` to gate iTunes metadata/artwork targets.
msbuild/Xamarin.Shared/Xamarin.Shared.targets	Uses `SdkIsSimulator` to gate `_PrepareResourceRules`.
msbuild/Xamarin.Shared/Xamarin.Shared.props	Removes `ComputedPlatform` computation and switches certain defaults to `SdkIsSimulator`.
dotnet/targets/Xamarin.Shared.Sdk.targets	Uses `SdkIsSimulator` for link-mode defaults previously keyed off `ComputedPlatform`.
dotnet/targets/Xamarin.Shared.Sdk.props	Exposes `SdkIsSimulator` and redefines `ComputedPlatform` for compatibility.
dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets	Removes the previous `ComputedPlatform` initialization block.

 	</Target>

-	<Target Name="CopyIpaFromMac" Condition="'$(OutputType)' == 'Exe' And '$(ComputedPlatform)' == 'iPhone' And '$(BuildIpa)' == 'true'">
+	<Target Name="CopyIpaFromMac" Condition="'$(OutputType)' == 'Exe' And '$(SdkIsSimulator)' != 'true' And '$(BuildIpa)' == 'true'">


 	</Target>

-	<Target Name="CopyDSYMFromMac" DependsOnTargets="_SayHello" Condition="'$(IsMacEnabled)' == 'true' And '$(IsAppExtension)' == 'false' And '$(ComputedPlatform)' == 'iPhone' And '$(CopyDSYM)' == 'true' And ('$(BuildIpa)' == 'true' Or '$(CopyAppBundle)' == 'true')" BeforeTargets="BeforeDisconnect">
+	<Target Name="CopyDSYMFromMac" DependsOnTargets="_SayHello" Condition="'$(IsMacEnabled)' == 'true' And '$(IsAppExtension)' == 'false' And '$(SdkIsSimulator)' != 'true' And '$(CopyDSYM)' == 'true' And ('$(BuildIpa)' == 'true' Or '$(CopyAppBundle)' == 'true')" BeforeTargets="BeforeDisconnect">


+		<ComputedPlatform Condition="'$(SdkIsSimulator)' == 'true'">iPhoneSimulator</ComputedPlatform>
+		<ComputedPlatform Condition="'$(ComputedPlatform)' == ''">iPhone</ComputedPlatform>


+	<Target Name="_CompileITunesMetadata" Condition="'$(SdkIsSimulator)' != 'true' And '$(IsAppExtension)' == 'false' And '$(IsWatchApp)' == 'false'"
 		DependsOnTargets="$(_CompileITunesMetadataDependsOn)"
 		Inputs="@(ITunesMetadata)"


+	<Target Name="_CollectITunesArtwork" Condition="'$(SdkIsSimulator)' != 'true' And '$(IsAppExtension)' == 'false' And '$(IsWatchApp)' == 'false'">
 		<CollectITunesArtwork
 			SessionId="$(BuildSessionId)"


+	<Target Name="_CopyITunesArtwork" Condition="'$(SdkIsSimulator)' != 'true' And '$(IsAppExtension)' == 'false' And '$(IsWatchApp)' == 'false'"
 		DependsOnTargets="_CollectITunesArtwork"
 		Inputs="@(_ITunesArtworkWithLogicalName)" Outputs="$(DeviceSpecificOutputPath)%(_ITunesArtworkWithLogicalName.LogicalName)">


 		<PrepareResourceRules
 			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true' And '$(CodesignResourceRules)' != '' And '$(ComputedPlatform)' == 'iPhone'"
+			Condition="'$(IsMacEnabled)' == 'true' And '$(CodesignResourceRules)' != '' And '$(SdkIsSimulator)' != 'true'"


Only set ComputedPlatform for iOS and tvOS (like the old behavior). Introduce a new SdkIsDevice property that's set to true when building for device (iOS and tvOS only), and use it to retain the original behavior of ComputedPlatform == 'iPhone' wherever needed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

vs-mobiletools-engineering-service2 · 2026-04-30T10:47:53Z

✅ [PR Build #1892441] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 1892441b883e37c2506a4f342cd2781d376d2e42 [PR build]

vs-mobiletools-engineering-service2 · 2026-04-30T10:49:17Z

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

Pipeline on Agent
Hash: 1892441b883e37c2506a4f342cd2781d376d2e42 [PR build]

vs-mobiletools-engineering-service2 · 2026-04-30T11:02:24Z

✅ API diff for current PR / commit

NET (empty diffs)

iOS: vsdrops gist ( No breaking changes )
tvOS: vsdrops gist ( No breaking changes )
MacCatalyst: vsdrops gist ( No breaking changes )
macOS: vsdrops gist ( No breaking changes )

✅ API diff vs stable

NET (empty diffs)

iOS: vsdrops gist ( No breaking changes )
tvOS: vsdrops gist ( No breaking changes )
MacCatalyst: vsdrops gist ( No breaking changes )
macOS: vsdrops gist ( No breaking changes )

ℹ️ Generator diff

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

Pipeline on Agent
Hash: 1892441b883e37c2506a4f342cd2781d376d2e42 [PR build]

vs-mobiletools-engineering-service2 · 2026-04-30T11:15:44Z

✅ [CI Build #1892441] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 1892441b883e37c2506a4f342cd2781d376d2e42 [PR build]

vs-mobiletools-engineering-service2 · 2026-04-30T16:01:09Z

🔥 [CI Build #1892441] Test results 🔥

Test results

❌ Tests failed on VSTS: test results

3 tests crashed, 1 tests failed, 144 tests passed.

Failures

❌ framework tests

🔥 Failed catastrophically on VSTS: test results - framework (no summary found).

Html Report (VSDrops) Download

❌ introspection tests

🔥 Failed catastrophically on VSTS: test results - introspection (no summary found).

Html Report (VSDrops) Download

❌ windows tests

🔥 Failed catastrophically on VSTS: test results - windows (no summary found).

Html Report (VSDrops) Download

❌ Tests on macOS Tahoe (26) tests

1 tests failed, 4 tests passed.

Failed tests

monotouch-test: Failed (exit code 2)
- TestCancel : Connection timed out.
- TestEndpointProperty : Connection timed out.
- TestForceCancel : Connection timed out.
- ... and 135 more failures

Html Report (VSDrops) Download

Successes

✅ 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
✅ 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. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 15 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ sharpie: All 1 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

macOS tests

✅ Tests on macOS Monterey (12): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Ventura (13): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sequoia (15): All 5 tests passed. Html Report (VSDrops) Download

Linux Build Verification

✅ Linux build succeeded

Pipeline on Agent
Hash: 1892441b883e37c2506a4f342cd2781d376d2e42 [PR build]

[msbuild/dotnet] Use 'SdkIsSimulator' instead of 'ComputedPlatform'.

4f8c185

This simplifies the code, since we only have a single property as the source of truth whether we're building for the simulator or not.

rolfbjarne requested a review from Copilot April 23, 2026 12:14

Copilot started reviewing on behalf of rolfbjarne April 23, 2026 12:14 View session

Copilot AI reviewed Apr 23, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'main' into dev/rolf/msbuild-computedplatform

f72937b

This comment has been minimized.

Sign in to view

rolfbjarne and others added 5 commits April 30, 2026 11:52

tweaks

da7ac40

[docs] Document the new SdkIsDevice property.

668d8c8

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

[docs] Add instruction to check docs/ when making changes.

15c81d2

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

[docs] Sort SdkIsDevice before SdkIsSimulator alphabetically.

1892441

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

		<ComputedPlatform Condition="'$(SdkIsSimulator)' == 'true'">iPhoneSimulator</ComputedPlatform>
		<ComputedPlatform Condition="'$(ComputedPlatform)' == ''">iPhone</ComputedPlatform>

Conversation

rolfbjarne commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

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.

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.

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.

vs-mobiletools-engineering-service2 commented Apr 30, 2026

✅ [PR Build #1892441] Build passed (Build packages) ✅

Uh oh!

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Apr 30, 2026

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

Uh oh!

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Apr 30, 2026

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

Uh oh!

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Apr 30, 2026

✅ [CI Build #1892441] Build passed (Build macOS tests) ✅

Uh oh!

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Apr 30, 2026

🔥 [CI Build #1892441] Test results 🔥

Test results

Failures

❌ framework tests

❌ introspection tests

❌ windows tests

❌ Tests on macOS Tahoe (26) tests

Failed tests

Successes

macOS tests

Linux Build Verification

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants