From e204ade78ae23262e7a6d743ce52949e9dd1952e Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 20 Jul 2020 09:56:23 +0200
Subject: [PATCH] [tests] Switch msbuild-mac to use package references.

And don't specify the solution path anymore, because we can restore using just
the csproj just fine now.
---
 tests/msbuild-mac/msbuild-mac.csproj             |  8 ++------
 tests/msbuild-mac/packages.config                | 11 -----------
 tests/xharness/Jenkins/MacTestTasksEnumerable.cs |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 tests/msbuild-mac/packages.config

diff --git a/tests/msbuild-mac/msbuild-mac.csproj b/tests/msbuild-mac/msbuild-mac.csproj
index 32092bb6edf0..35c72d46e131 100644
--- a/tests/msbuild-mac/msbuild-mac.csproj
+++ b/tests/msbuild-mac/msbuild-mac.csproj
@@ -33,9 +33,8 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.3.11.0\lib\net40\nunit.framework.dll</HintPath>
-    </Reference>
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
@@ -75,9 +74,6 @@
       <Link>Cache.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="CustomBuildActions.targets" />
 </Project>
diff --git a/tests/msbuild-mac/packages.config b/tests/msbuild-mac/packages.config
deleted file mode 100644
index 18cf498555b4..000000000000
--- a/tests/msbuild-mac/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.11.0" targetFramework="net40" requireReinstallation="true" />
-  <package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net40" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net40" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net40" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net40" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.5" targetFramework="net40" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net40" />
-  <package id="NUnit.Runners" version="3.9.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/tests/xharness/Jenkins/MacTestTasksEnumerable.cs b/tests/xharness/Jenkins/MacTestTasksEnumerable.cs
index 27f7a6203371..0bdadab2d6c4 100644
--- a/tests/xharness/Jenkins/MacTestTasksEnumerable.cs
+++ b/tests/xharness/Jenkins/MacTestTasksEnumerable.cs
@@ -82,7 +82,6 @@ public IEnumerator<RunTestTask> GetEnumerator ()
 					MSBuildTask build = new MSBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
 					build.Platform = platform;
 					build.CloneTestProject (jenkins.MainLog, processManager, project);
-					build.SolutionPath = project.SolutionPath;
 					build.ProjectConfiguration = config;
 					build.ProjectPlatform = project.Platform;
 					build.SpecifyPlatform = false;