Skip to content

[msbuild] Fix listing devices with no udid. Fixes #24605. #24607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 2 commits into from
Feb 3, 2026
Merged

[msbuild] Fix listing devices with no udid. Fixes #24605. #24607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe71b2c
[msbuild] Fix listing devices with no udid. Fixes #24605.
rolfbjarne Feb 2, 2026
f6fa34e
Remove accidental inclusion.
rolfbjarne Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/GetAvailableDevices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ async System.Threading.Tasks.Task<IEnumerable<DeviceInfo>> RunDeviceCtlAsync ()
foreach (var device in array) {
var name = device.GetStringPropertyOrEmpty ("deviceProperties", "name");
var udid = device.GetStringPropertyOrEmpty ("hardwareProperties", "udid");
var identifier = device.GetStringPropertyOrEmpty ("identifier");

var deviceProperties = device.GetNullableProperty ("deviceProperties");
var buildVersion = deviceProperties.GetStringPropertyOrEmpty ("osBuildUpdate");
Expand All @@ -200,6 +201,12 @@ async System.Threading.Tasks.Task<IEnumerable<DeviceInfo>> RunDeviceCtlAsync ()
var transportType = connectionProperties.GetStringPropertyOrEmpty ("transportType");
var pairingState = connectionProperties.GetStringPropertyOrEmpty ("pairingState");

if (string.IsNullOrEmpty (udid))
udid = identifier;

if (string.IsNullOrEmpty (udid))
udid = $"<unknown udid #{rv.Count + 1}>";

Comment thread
rolfbjarne marked this conversation as resolved.
var item = new TaskItem (udid);
item.SetMetadata ("Name", name);
item.SetMetadata ("BuildVersion", buildVersion);
Expand Down
51 changes: 51 additions & 0 deletions tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/GetAvailableDevicesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,23 @@ public void Ctl1_AppleTV ()
});
}

[Test]
public void DeviceCtl2_Mac ()
{
var platform = ApplePlatform.iOS;
var task = CreateTask (platform, "", DEVICECTL_JSON_2);
Assert.IsTrue (task.Execute (), "Task should have succeeded.");

Assert.Multiple (() => {
Assert.That (task.DiscardedDevices [0].ItemSpec, Is.EqualTo ("12345678-1234-1234-ABCD-1234567980AB"), "Discarded Device 1 itemspec mismatch.");
Assert.That (task.DiscardedDevices [0].GetMetadata ("Description"), Is.EqualTo (""), "Discarded Device 1 Name mismatch.");
Assert.That (task.DiscardedDevices [0].GetMetadata ("OSVersion"), Is.EqualTo (""), "Discarded Device 1 OSVersion mismatch.");
Assert.That (task.DiscardedDevices [0].GetMetadata ("UDID"), Is.EqualTo ("12345678-1234-1234-ABCD-1234567980AB"), "Discarded Device 1 UDID mismatch.");
Assert.That (task.DiscardedDevices [0].GetMetadata ("RuntimeIdentifier"), Is.EqualTo (""), "Discarded Device 1 RuntimeIdentifier mismatch.");
Assert.That (task.DiscardedDevices [0].GetMetadata ("DiscardedReason"), Is.EqualTo ("'mac' devices are not supported"), "Discarded Device 1 reason mismatch.");
});
}

const string DEVICECTL_JSON_1 =
"""
{
Expand Down Expand Up @@ -897,6 +914,40 @@ public void Ctl1_AppleTV ()
}
""";

const string DEVICECTL_JSON_2 =
"""
{
"result" : {
"devices" : [
{
"connectionProperties" : {
"isMobileDeviceOnly" : false,
"pairingState" : "unsupported",
"potentialHostnames" : [
"12345678-1234-1234-ABCD-1234567980AB.coredevice.local"
],
"tunnelState" : "unavailable"
},
"deviceProperties" : {
"bootState" : "booted",
"ddiServicesAvailable" : false,
"providerSpecificValues" : {
"hasAMRestorableDeviceRef" : "true"
}
},
"hardwareProperties" : {
"deviceType" : "mac",
"platform" : "macOS",
"productType" : "MacBookPro17,1"
},
"identifier" : "12345678-1234-1234-ABCD-1234567980AB",
"visibilityClass" : "default"
}
]
}
}
""";

const string SIMCTL_JSON_1 =
"""
{
Expand Down
Loading