From 1d63bb18a1e85731b3f81e90f9205a9a8ed11432 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 22 Jul 2020 18:28:53 +0200
Subject: [PATCH] [xharness] Make restoring nugets the default for all test
 projects.

But don't do it for .NET projects, since 'dotnet build' automatically restores.
---
 .../Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs  | 2 ++
 .../Microsoft.DotNet.XHarness.iOS.Shared/TestProject.cs         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs
index 288ce86ab6d..c4e35bebb86 100644
--- a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs
+++ b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Tasks/BuildProject.cs
@@ -27,6 +27,8 @@ public BuildProject (Func<string> msbuildPath, IProcessManager processManager, I
 
 		public bool RestoreNugets {
 			get {
+				if (TestProject.IsDotNetProject)
+					return false;
 				return TestProject.RestoreNugetsInProject || !string.IsNullOrEmpty (SolutionPath);
 			}
 		}
diff --git a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/TestProject.cs b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/TestProject.cs
index cb28bdc31c5..ee20b13d55b 100644
--- a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/TestProject.cs
+++ b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/TestProject.cs
@@ -25,7 +25,7 @@ public class TestProject
 		public string [] Configurations;
 		public Func<Task> Dependency;
 		public string FailureMessage;
-		public bool RestoreNugetsInProject;
+		public bool RestoreNugetsInProject = true;
 		public string MTouchExtraArgs;
 		public double TimeoutMultiplier = 1;