From c59419115a4cccffdf4496aab0cc38e894383380 Mon Sep 17 00:00:00 2001
From: Chris C <chris.cumming@saturdaymp.com>
Date: Thu, 21 Sep 2017 14:51:40 -0600
Subject: [PATCH 1/3] Updated to Android 7.1 and NUnit 3.8.1. #87

---
 src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj       | 4 ++--
 .../nunit.runner.Droid/nunit.runner.Droid.nuget.targets       | 2 +-
 src/runner/nunit.runner.Droid/project.json                    | 4 ++--
 src/runner/nunit.runner.iOS/nunit.runner.iOS.nuget.targets    | 2 +-
 src/runner/nunit.runner.iOS/project.json                      | 2 +-
 src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets    | 2 +-
 src/runner/nunit.runner.uwp/project.json                      | 2 +-
 .../nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj  | 4 ++--
 .../nunit.runner.tests.Droid.nuget.targets                    | 2 +-
 src/tests/nunit.runner.tests.Droid/project.json               | 4 ++--
 .../nunit.runner.tests.iOS.nuget.targets                      | 2 +-
 src/tests/nunit.runner.tests.iOS/project.json                 | 2 +-
 .../nunit.runner.tests.uwp.nuget.targets                      | 2 +-
 src/tests/nunit.runner.tests.uwp/project.json                 | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj b/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
index 7106225..8237493 100644
--- a/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
+++ b/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
@@ -13,11 +13,11 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/runner/nunit.runner.Droid/nunit.runner.Droid.nuget.targets b/src/runner/nunit.runner.Droid/nunit.runner.Droid.nuget.targets
index caeef78..7091ed7 100644
--- a/src/runner/nunit.runner.Droid/nunit.runner.Droid.nuget.targets
+++ b/src/runner/nunit.runner.Droid/nunit.runner.Droid.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/runner/nunit.runner.Droid/project.json b/src/runner/nunit.runner.Droid/project.json
index e0d0366..ef9edd1 100644
--- a/src/runner/nunit.runner.Droid/project.json
+++ b/src/runner/nunit.runner.Droid/project.json
@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "NUnit": "3.6.1",
+    "NUnit": "3.8.1",
     "PCLStorage": "1.0.2",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {
-    "monoandroid60": {}
+    "monoandroid71": {}
   },
   "runtimes": {
     "win": {}
diff --git a/src/runner/nunit.runner.iOS/nunit.runner.iOS.nuget.targets b/src/runner/nunit.runner.iOS/nunit.runner.iOS.nuget.targets
index caeef78..7091ed7 100644
--- a/src/runner/nunit.runner.iOS/nunit.runner.iOS.nuget.targets
+++ b/src/runner/nunit.runner.iOS/nunit.runner.iOS.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/runner/nunit.runner.iOS/project.json b/src/runner/nunit.runner.iOS/project.json
index 068d8b6..a52a04f 100644
--- a/src/runner/nunit.runner.iOS/project.json
+++ b/src/runner/nunit.runner.iOS/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NUnit": "3.6.1",
+    "NUnit": "3.8.1",
     "PCLStorage": "1.0.2",
     "Xamarin.Forms": "1.5.0.6447"
   },
diff --git a/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets b/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets
index caeef78..7091ed7 100644
--- a/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets
+++ b/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/runner/nunit.runner.uwp/project.json b/src/runner/nunit.runner.uwp/project.json
index fdc4359..663bc8b 100644
--- a/src/runner/nunit.runner.uwp/project.json
+++ b/src/runner/nunit.runner.uwp/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "NUnit": "3.6.1",
+    "NUnit": "3.8.1",
     "PCLStorage": "1.0.2",
     "Xamarin.Forms": "1.5.0.6447"
   },
diff --git a/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj b/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj
index 125a234..84f269e 100644
--- a/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj
+++ b/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj
@@ -14,7 +14,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
     <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
     <MandroidI18n />
@@ -24,7 +24,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.nuget.targets b/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.nuget.targets
index caeef78..7091ed7 100644
--- a/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.nuget.targets
+++ b/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tests/nunit.runner.tests.Droid/project.json b/src/tests/nunit.runner.tests.Droid/project.json
index 730ca3c..5ed34bc 100644
--- a/src/tests/nunit.runner.tests.Droid/project.json
+++ b/src/tests/nunit.runner.tests.Droid/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "NUnit": "3.6.1",
+    "NUnit": "3.8.1",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {
-    "monoandroid60": {}
+    "monoandroid71": {}
   },
   "runtimes": {
     "win": {}
diff --git a/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.nuget.targets b/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.nuget.targets
index caeef78..7091ed7 100644
--- a/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.nuget.targets
+++ b/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tests/nunit.runner.tests.iOS/project.json b/src/tests/nunit.runner.tests.iOS/project.json
index e9c003e..33c7da3 100644
--- a/src/tests/nunit.runner.tests.iOS/project.json
+++ b/src/tests/nunit.runner.tests.iOS/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NUnit": "3.6.1",
+    "NUnit": "3.8.1",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {
diff --git a/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets b/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets
index caeef78..7091ed7 100644
--- a/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets
+++ b/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tests/nunit.runner.tests.uwp/project.json b/src/tests/nunit.runner.tests.uwp/project.json
index f56852b..39acbe6 100644
--- a/src/tests/nunit.runner.tests.uwp/project.json
+++ b/src/tests/nunit.runner.tests.uwp/project.json
@@ -4,7 +4,7 @@
     "Microsoft.ApplicationInsights.PersistenceChannel": "1.2.3",
     "Microsoft.ApplicationInsights.WindowsApps": "1.1.1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "NUnit": "3.6.1",
+    "NUnit": "3.8.1",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {

From 48da060594f163cac2005962c7d78e1922531805 Mon Sep 17 00:00:00 2001
From: Chris C <chris.cumming@saturdaymp.com>
Date: Thu, 21 Sep 2017 15:19:36 -0600
Subject: [PATCH 2/3] Updated nuspec dependence to NUnit 3.8.1 or higher. #87

---
 nuget/nunit.runners.xamarin.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuget/nunit.runners.xamarin.nuspec b/nuget/nunit.runners.xamarin.nuspec
index 619d283..0b8118f 100644
--- a/nuget/nunit.runners.xamarin.nuspec
+++ b/nuget/nunit.runners.xamarin.nuspec
@@ -23,7 +23,7 @@ Supported Xamarin platforms:
 
         <dependencies>
             <group>
-                <dependency id="nunit" version="[3.6.1]" />
+                <dependency id="nunit" version="3.8.1" />
                 <dependency id="Xamarin.Forms" version="1.5.0.6447" />
                 <dependency id="PCLStorage" version="1.0.2" />
             </group>

From 2fd2375781c4d4163695115af85635bd7d4be717 Mon Sep 17 00:00:00 2001
From: Chris C <chris.cumming@saturdaymp.com>
Date: Tue, 26 Sep 2017 17:16:53 -0600
Subject: [PATCH 3/3] Updated the NUnit dependencies to 3.8.1 only, not 3.8.1
 or higher, NuSpec and Project.JSON files. #87

---
 nuget/nunit.runners.xamarin.nuspec              | 2 +-
 src/runner/nunit.runner.Droid/project.json      | 2 +-
 src/runner/nunit.runner.iOS/project.json        | 2 +-
 src/runner/nunit.runner.uwp/project.json        | 2 +-
 src/tests/nunit.runner.tests.Droid/project.json | 2 +-
 src/tests/nunit.runner.tests.iOS/project.json   | 2 +-
 src/tests/nunit.runner.tests.uwp/project.json   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nuget/nunit.runners.xamarin.nuspec b/nuget/nunit.runners.xamarin.nuspec
index 0b8118f..a781993 100644
--- a/nuget/nunit.runners.xamarin.nuspec
+++ b/nuget/nunit.runners.xamarin.nuspec
@@ -23,7 +23,7 @@ Supported Xamarin platforms:
 
         <dependencies>
             <group>
-                <dependency id="nunit" version="3.8.1" />
+                <dependency id="nunit" version="[3.8.1]" />
                 <dependency id="Xamarin.Forms" version="1.5.0.6447" />
                 <dependency id="PCLStorage" version="1.0.2" />
             </group>
diff --git a/src/runner/nunit.runner.Droid/project.json b/src/runner/nunit.runner.Droid/project.json
index ef9edd1..c9610b1 100644
--- a/src/runner/nunit.runner.Droid/project.json
+++ b/src/runner/nunit.runner.Droid/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NUnit": "3.8.1",
+    "NUnit": "[3.8.1]",
     "PCLStorage": "1.0.2",
     "Xamarin.Forms": "1.5.0.6447"
   },
diff --git a/src/runner/nunit.runner.iOS/project.json b/src/runner/nunit.runner.iOS/project.json
index a52a04f..3261e35 100644
--- a/src/runner/nunit.runner.iOS/project.json
+++ b/src/runner/nunit.runner.iOS/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NUnit": "3.8.1",
+    "NUnit": "[3.8.1]",
     "PCLStorage": "1.0.2",
     "Xamarin.Forms": "1.5.0.6447"
   },
diff --git a/src/runner/nunit.runner.uwp/project.json b/src/runner/nunit.runner.uwp/project.json
index 663bc8b..e72d66d 100644
--- a/src/runner/nunit.runner.uwp/project.json
+++ b/src/runner/nunit.runner.uwp/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "NUnit": "3.8.1",
+    "NUnit": "[3.8.1]",
     "PCLStorage": "1.0.2",
     "Xamarin.Forms": "1.5.0.6447"
   },
diff --git a/src/tests/nunit.runner.tests.Droid/project.json b/src/tests/nunit.runner.tests.Droid/project.json
index 5ed34bc..680da2c 100644
--- a/src/tests/nunit.runner.tests.Droid/project.json
+++ b/src/tests/nunit.runner.tests.Droid/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NUnit": "3.8.1",
+    "NUnit": "[3.8.1]",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {
diff --git a/src/tests/nunit.runner.tests.iOS/project.json b/src/tests/nunit.runner.tests.iOS/project.json
index 33c7da3..14b5803 100644
--- a/src/tests/nunit.runner.tests.iOS/project.json
+++ b/src/tests/nunit.runner.tests.iOS/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NUnit": "3.8.1",
+    "NUnit": "[3.8.1]",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {
diff --git a/src/tests/nunit.runner.tests.uwp/project.json b/src/tests/nunit.runner.tests.uwp/project.json
index 39acbe6..118da55 100644
--- a/src/tests/nunit.runner.tests.uwp/project.json
+++ b/src/tests/nunit.runner.tests.uwp/project.json
@@ -4,7 +4,7 @@
     "Microsoft.ApplicationInsights.PersistenceChannel": "1.2.3",
     "Microsoft.ApplicationInsights.WindowsApps": "1.1.1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "NUnit": "3.8.1",
+    "NUnit": "[3.8.1]",
     "Xamarin.Forms": "1.5.0.6447"
   },
   "frameworks": {