Skip to content

[msbuild] Fix finding applicable simulator devices in GetMlaunchArguments task. #24610

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 4 commits into from
Feb 3, 2026
+7 −5
Merged

[msbuild] Fix finding applicable simulator devices in GetMlaunchArguments task. #24610

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eb2966
[msbuild] Fix finding applicable simulator devices in GetMlaunchArgum…
rolfbjarne Feb 2, 2026
9a2019e
Merge branch 'main' into dev/rolf/msbuild-select-devices-fix
dalexsoto Feb 2, 2026
80b37c3
Auto-format source code
Feb 2, 2026
4ad1d10
Merge branch 'main' into dev/rolf/msbuild-select-devices-fix
rolfbjarne Feb 3, 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
12 changes: 7 additions & 5 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/GetMlaunchArguments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,19 @@ public IPhoneDeviceType DeviceType {
return null;

// Which product family are we looking for?
string productFamily;
string [] productFamilies;
switch (DeviceType) {
case IPhoneDeviceType.IPhone:
productFamily = "iPhone";
productFamilies = [ "iPhone" ];
break;
case IPhoneDeviceType.IPad:
productFamilies = [ "iPad" ];
break;
case IPhoneDeviceType.IPhoneAndIPad:
productFamily = "iPad";
productFamilies = [ "iPhone", "iPad" ];
break;
case IPhoneDeviceType.TV:
productFamily = "Apple TV";
productFamilies = [ "Apple TV" ];
break;
default:
throw new InvalidOperationException ($"Invalid device type: {DeviceType}");
Expand All @@ -85,7 +87,7 @@ public IPhoneDeviceType DeviceType {
var xml = new XmlDocument ();
xml.LoadXml (output);
// Get the device types for the product family we're looking for
var nodes = xml.SelectNodes ($"/MTouch/Simulator/SupportedDeviceTypes/SimDeviceType[ProductFamilyId='{productFamily}']")?.Cast<XmlNode> () ?? Array.Empty<XmlNode> ();
var nodes = xml.SelectNodes ($"/MTouch/Simulator/SupportedDeviceTypes/SimDeviceType[{string.Join (" or ", productFamilies.Select (v => $"ProductFamilyId='{v}'"))}]")?.Cast<XmlNode> () ?? Array.Empty<XmlNode> ();
// Create a list of them all
var deviceTypes = new List<(long Min, long Max, string Identifier)> ();
foreach (var node in nodes) {
Expand Down
Loading