Skip to content

Commit a1b24e9

Browse files
committed
InstallAndRunTests.DotNetInstallAndRunPreviousSdk updated
1 parent 6f4b0c9 commit a1b24e9

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,16 +1205,25 @@ public void CheckResouceIsOverridden ([Values] AndroidRuntime runtime)
12051205
[Test]
12061206
[Category ("WearOS")]
12071207
public void DotNetInstallAndRunPreviousSdk (
1208-
[Values (false, true)] bool isRelease,
1209-
[Values ("net9.0-android")] string targetFramework)
1208+
[Values] bool isRelease,
1209+
[Values ("net9.0-android")] string targetFramework,
1210+
[Values] AndroidRuntime runtime)
12101211
{
1211-
var proj = new XamarinFormsAndroidApplicationProject () {
1212+
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
1213+
return;
1214+
}
1215+
1216+
// Mono-only test for the moment (until net10 or later is the "previous" framework)
1217+
if (runtime != AndroidRuntime.MonoVM) {
1218+
Assert.Ignore ("Mono-only test util net9 is no longer the 'previous' SDK");
1219+
}
1220+
1221+
var proj = new XamarinFormsAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
12121222
TargetFramework = targetFramework,
12131223
IsRelease = isRelease,
12141224
EnableDefaultItems = true,
12151225
};
1216-
// Mono-only test
1217-
proj.SetRuntime (AndroidRuntime.MonoVM);
1226+
proj.SetRuntime (runtime);
12181227

12191228
// Requires 32-bit ABIs
12201229
proj.SetAndroidSupportedAbis (["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]);

0 commit comments

Comments
 (0)