From b90646b35299fc9287b3156ed083a2f951fa3b74 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Aug 2025 09:18:09 -0500 Subject: [PATCH 1/2] [tests] builds from forks skip `AssertCommercialBuild()` tests Context: https://github.com/dotnet/android/pull/10438 We can always call `Assert.Inconclusive()`, to prevent failing tests from contributors. --- .../Xamarin.Android.Build.Tests/Utilities/BaseTest.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs index 1d3d5dca3fe..4dffeaa58c6 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs @@ -31,17 +31,11 @@ public class BaseTest /// Checks if a commercial .NET for Android is available /// * Defaults to Assert.Ignore () /// - public void AssertCommercialBuild (bool fail = false) + public void AssertCommercialBuild () { if (!TestEnvironment.CommercialBuildAvailable) { var message = $"'{TestName}' requires a commercial build of .NET for Android."; - var runningOnCI = false; - bool.TryParse (Environment.GetEnvironmentVariable ("RunningOnCI"), out runningOnCI); - if (fail || runningOnCI) { - Assert.Fail (message); - } else { - Assert.Ignore (message); - } + Assert.Inconclusive (message); } } From 9eb59acb69b58fd37971218fbede7563372aa054 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Aug 2025 12:18:34 -0500 Subject: [PATCH 2/2] Update PerformanceTest.cs --- tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs index e391bf578a0..abcb1c8d67f 100644 --- a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs @@ -144,6 +144,8 @@ XamarinAndroidApplicationProject CreateApplicationProject () [Retry (Retry)] public void Build_From_Clean_DontIncludeRestore () { + AssertCommercialBuild (); // If runs, this test will fail without Fast Deployment + var proj = CreateApplicationProject (); using (var builder = CreateBuilderWithoutLogFile ()) { builder.AutomaticNuGetRestore = false; @@ -257,6 +259,8 @@ public void Build_AndroidAsset_Change () [Retry (Retry)] public void Build_JLO_Change () { + AssertCommercialBuild (); // If runs, this test will fail without Fast Deployment + var className = "Foo"; var proj = CreateApplicationProject (); proj.Sources.Add (new BuildItem.Source ("Foo.cs") {