From 7476a4b6c293d2d3985656bf3bc9db9ce6622aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Mon, 2 Jan 2017 17:42:49 +0100
Subject: [PATCH 1/2] Fixed paths to nunit.framework.dll

Make sure we're using the NuGet one instead of the GAC
since the latter one is deprecated as of Mono 4.9.
---
 .../Tests/Java.Interop.Dynamic-Tests.csproj                  | 2 +-
 .../Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj  | 5 ++---
 .../Java.Interop-PerformanceTests.csproj                     | 4 ++--
 tests/TestJVM/TestJVM.csproj                                 | 2 +-
 tools/generator/Tests/generator-Tests.csproj                 | 3 +--
 tools/logcat-parse/Tests/LogcatParse-Tests.csproj            | 4 +++-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj b/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj
index 0a939c64c..936113b26 100644
--- a/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj
+++ b/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj
@@ -37,7 +37,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
-      <HintPath>..\..\..\lib\NUnit-2.6.3\bin\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj
index b961eb0f6..6994fda4f 100644
--- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj
+++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj
@@ -31,8 +31,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <Package>nunit</Package>
+      <HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -54,4 +53,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj
index 51a5f0fad..2ef2f4841 100644
--- a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj
+++ b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj
@@ -34,7 +34,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
-      <HintPath>..\..\lib\NUnit-2.6.3\bin\nunit.framework.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -62,4 +62,4 @@
       <Name>TestJVM</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/TestJVM/TestJVM.csproj b/tests/TestJVM/TestJVM.csproj
index 79213aea4..338827ff0 100644
--- a/tests/TestJVM/TestJVM.csproj
+++ b/tests/TestJVM/TestJVM.csproj
@@ -38,7 +38,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
-      <HintPath>..\..\..\lib\NUnit-2.6.3\bin\nunit.framework.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/tools/generator/Tests/generator-Tests.csproj b/tools/generator/Tests/generator-Tests.csproj
index 984324274..ebf6375c5 100644
--- a/tools/generator/Tests/generator-Tests.csproj
+++ b/tools/generator/Tests/generator-Tests.csproj
@@ -35,8 +35,7 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <Package>nunit</Package>
+      <HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/tools/logcat-parse/Tests/LogcatParse-Tests.csproj b/tools/logcat-parse/Tests/LogcatParse-Tests.csproj
index 870b5632c..18e63b6fb 100644
--- a/tools/logcat-parse/Tests/LogcatParse-Tests.csproj
+++ b/tools/logcat-parse/Tests/LogcatParse-Tests.csproj
@@ -31,7 +31,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.framework" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GrefsTest.cs" />

From 0ce2535d3a2f1e631a1fd30f1bb00fecf23df3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Mon, 2 Jan 2017 17:49:05 +0100
Subject: [PATCH 2/2] Add DebugType=full to TestJVM.csproj

Workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=51175
---
 tests/TestJVM/TestJVM.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/TestJVM/TestJVM.csproj b/tests/TestJVM/TestJVM.csproj
index 338827ff0..8633e18aa 100644
--- a/tests/TestJVM/TestJVM.csproj
+++ b/tests/TestJVM/TestJVM.csproj
@@ -13,6 +13,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
     <OutputPath>..\..\bin\TestDebug</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <DefineTrace>false</DefineTrace>