From 6d5f0e4ebde6eea79c7e9fb824f908bfb1c52da6 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 23 Jul 2020 09:57:42 +0200
Subject: [PATCH] [tests] Migrate the sample tests to use package references.

---
 tests/sampletester/packages.config                 | 6 ------
 tests/sampletester/sampletester.csproj             | 8 ++------
 tests/xharness/Jenkins/NUnitTestTasksEnumerable.cs | 2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 tests/sampletester/packages.config

diff --git a/tests/sampletester/packages.config b/tests/sampletester/packages.config
deleted file mode 100644
index 01642e155641..000000000000
--- a/tests/sampletester/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.11.0" targetFramework="net45" />
-  <package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net45" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/tests/sampletester/sampletester.csproj b/tests/sampletester/sampletester.csproj
index 2314a78a6297..f8d3f237f85f 100644
--- a/tests/sampletester/sampletester.csproj
+++ b/tests/sampletester/sampletester.csproj
@@ -30,11 +30,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="SampleTester.cs" />
@@ -64,9 +63,6 @@
       <Link>external\Execution.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="external\" />
   </ItemGroup>
diff --git a/tests/xharness/Jenkins/NUnitTestTasksEnumerable.cs b/tests/xharness/Jenkins/NUnitTestTasksEnumerable.cs
index c58cdee14a57..d904862e1c16 100644
--- a/tests/xharness/Jenkins/NUnitTestTasksEnumerable.cs
+++ b/tests/xharness/Jenkins/NUnitTestTasksEnumerable.cs
@@ -117,7 +117,7 @@ public IEnumerator<NUnitExecuteTask> GetEnumerator ()
 			};
 			yield return runCecilTests;
 
-			var buildSampleTestsProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "sampletester", "sampletester.sln")));
+			var buildSampleTestsProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "sampletester", "sampletester.csproj")));
 			var buildSampleTests = new MSBuildTask (jenkins: jenkins, testProject: buildSampleTestsProject, processManager: processManager) {
 				SpecifyPlatform = false,
 				Platform = TestPlatform.All,