Skip to content

Commit 60f5c7b

Browse files
authored
[release/9.0.1xx] Bump mlaunch to get a version that works with Xcode 26. (#23590)
This _might_ be enough to make .NET 9 kind of work with Xcode 26. Backport of #23499.
1 parent 31f0e87 commit 60f5c7b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

mk/xamarin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ endif
1010

1111
# Available versions can be seen here:
1212
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.Tools.Mlaunch/versions
13-
MLAUNCH_NUGET_VERSION=1.0.272
13+
MLAUNCH_NUGET_VERSION=1.1.72
1414

1515
define CheckVersionTemplate
1616
check-$(1)::

tests/dotnet/UnitTests/MlaunchTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ public void GetMlaunchInstallArguments (ApplePlatform platform, string runtimeId
5252
public static object [] GetMlaunchRunArgumentsTestCases ()
5353
{
5454
return new object [] {
55-
new object [] {ApplePlatform.iOS, "iossimulator-x64;iossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.iOS-{SdkVersions.iOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.iPhone-16e" },
55+
new object [] {ApplePlatform.iOS, "iossimulator-x64;iossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.iOS-{SdkVersions.iOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.iPhone-.*" },
5656
new object [] {ApplePlatform.iOS, "ios-arm64", "" },
57-
new object [] {ApplePlatform.TVOS, "tvossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.tvOS-{SdkVersions.TVOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-1080p" },
57+
new object [] {ApplePlatform.TVOS, "tvossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.tvOS-{SdkVersions.TVOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.Apple-TV-.*" },
5858
};
5959
}
6060

@@ -93,11 +93,11 @@ public void GetMlaunchRunArguments (ApplePlatform platform, string runtimeIdenti
9393
expectedArguments.Append (device);
9494
}
9595
expectedArguments.Append ($" --wait-for-exit:true");
96-
Assert.AreEqual (expectedArguments.ToString (), mlaunchRunArguments);
96+
Assert.That (mlaunchRunArguments, Does.Match (expectedArguments.ToString ()), "arguments");
9797

9898
var scriptContents = File.ReadAllText (outputPath).Trim ('\n');
9999
var expectedScriptContents = mlaunchPath + " " + expectedArguments.ToString ();
100-
Assert.AreEqual (expectedScriptContents, scriptContents, "Script contents");
100+
Assert.That (scriptContents, Does.Match (expectedScriptContents), "Script contents");
101101
}
102102
}
103103
}

0 commit comments

Comments
 (0)