From 9a4067870872d980f6c2e2a929dbe89e6324fe03 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 22 Jul 2020 19:21:31 +0200
Subject: [PATCH 1/2] [xharness] Fix how .NET projects are ignored.

Now they're actually ignored if .NET tests are not included.
---
 tests/xharness/Jenkins/RunSimulatorTasksFactory.cs | 1 +
 tests/xharness/Jenkins/TestVariationsFactory.cs    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs b/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
index 8b3dfb811cbc..529252f5a269 100644
--- a/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
+++ b/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
@@ -42,6 +42,7 @@ public async Task<IEnumerable<ITestTask>> CreateAsync (Jenkins jenkins, IProcess
 						MSBuildTask derived;
 						if (project.IsDotNetProject) {
 							derived = new DotNetBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
+							configIgnored |= !jenkins.IncludeDotNet;
 						} else {
 							derived = new MSBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
 						}
diff --git a/tests/xharness/Jenkins/TestVariationsFactory.cs b/tests/xharness/Jenkins/TestVariationsFactory.cs
index 1f815eefd94b..22aae4f6e5b0 100644
--- a/tests/xharness/Jenkins/TestVariationsFactory.cs
+++ b/tests/xharness/Jenkins/TestVariationsFactory.cs
@@ -222,6 +222,7 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
 					MSBuildTask build;
 					if (clone.IsDotNetProject) {
 						build = new DotNetBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager);
+						ignored |= !jenkins.IncludeDotNet;
 					} else {
 						build = new MSBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager);
 					}

From 2e4016624fb66b807cd629dc439bded4f211e3d8 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 24 Jul 2020 11:49:28 +0200
Subject: [PATCH 2/2] Fix compile error.

---
 tests/xharness/Jenkins/RunSimulatorTasksFactory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs b/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
index 529252f5a269..b2096c84aec9 100644
--- a/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
+++ b/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
@@ -40,6 +40,7 @@ public async Task<IEnumerable<ITestTask>> CreateAsync (Jenkins jenkins, IProcess
 				foreach (var config in configurations) {
 					foreach (var pair in ps) {
 						MSBuildTask derived;
+						var configIgnored = pair.Item3;
 						if (project.IsDotNetProject) {
 							derived = new DotNetBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
 							configIgnored |= !jenkins.IncludeDotNet;
@@ -49,7 +50,7 @@ public async Task<IEnumerable<ITestTask>> CreateAsync (Jenkins jenkins, IProcess
 						derived.ProjectConfiguration = config;
 						derived.ProjectPlatform = "iPhoneSimulator";
 						derived.Platform = pair.Item2;
-						derived.Ignored = pair.Item3;
+						derived.Ignored = configIgnored;
 						derived.TestName = project.Name;
 						derived.Dependency = project.Dependency;
 						derived.CloneTestProject (jenkins.MainLog, processManager, pair.Item1);