From e094738404d3ecec43f0c67e596f8cc48479198b Mon Sep 17 00:00:00 2001
From: Rob Prouse <rob@prouse.org>
Date: Fri, 4 Sep 2015 16:25:38 -0400
Subject: [PATCH] Fixed issues based on testing

---
 NUnit.proj                                    | 24 +++++++++++++++----
 nuget/MainActivity.cs.txt.pp                  |  2 +-
 nuget/nunit.runners.xamarin.nuspec            | 14 +++++++----
 nunit.runner.sln                              |  1 +
 .../nunit.runner.Droid.csproj                 |  1 +
 .../nunit.runner.iOS/nunit.runner.iOS.csproj  |  7 +++---
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/NUnit.proj b/NUnit.proj
index 5e370c6..2859e82 100644
--- a/NUnit.proj
+++ b/NUnit.proj
@@ -82,12 +82,21 @@
 
 	<Target Name="Build" Label="Build the Xamarin runner projects" DependsOnTargets="BuildRunner" />
 
-	<Target Name="BuildAll" Label="Build the Xamarin runner projects" DependsOnTargets="BuildRunner" />
+	<Target Name="BuildAll" Label="Build the Xamarin runner projects and the platform specific test projects" 
+					DependsOnTargets="BuildRunner,BuildAndroid,BuildIos" />
 
 	<Target Name="BuildRunner" Label="Build the Xamarin runner projects">
 		<MSBuild Targets="Build" Projects="@(RunnerProjects)" Properties="Configuration=$(Configuration); Platform=AnyCPU" />
 	</Target>
 
+	<Target Name="BuildAndroid" Label="Build the Android test project">
+		<MSBuild Targets="Build" Projects="@(AndroidProjects)" Properties="Configuration=$(Configuration); Platform=AnyCPU" />
+	</Target>
+
+	<Target Name="BuildIos" Label="Build the iPhone test project">
+		<MSBuild Targets="Build" Projects="@(IosProjects)" Properties="Configuration=$(Configuration); Platform=iPhone" />
+	</Target>
+
 	<!-- End Region -->
 
 	<!-- Region Packaging Targets -->
@@ -99,8 +108,7 @@
 	<!--   creates the package to first make sure that the build is up to date.  -->
 	<!-- *********************************************************************** -->
 
-	<Target Name="PackageNuGet" Label="Creates the NuGet package"
-      DependsOnTargets="_CreateImageIfNotPresent">
+	<Target Name="PackageNuGet" Label="Creates the NuGet package">
 
 		<Message Text="******************************************************************" />
 		<Message Text="* Creating the Nuget $(Configuration) package" />
@@ -118,8 +126,14 @@
 	<ItemGroup Label="Projects for building Xamarin runners">
 		<RunnerProjects Include="$(ProjectSrcDir)\runner\nunit.runner.Droid\nunit.runner.Droid.csproj" />
 		<RunnerProjects Include="$(ProjectSrcDir)\runner\nunit.runner.iOS\nunit.runner.iOS.csproj" />
-		<RunnerProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.Droid\nunit.runner.tests.Droid.csproj" />
-		<RunnerProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.iOS\nunit.runner.tests.iOS.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Label="Android test project">
+		<AndroidProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.Droid\nunit.runner.tests.Droid.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Label="iOS test project">
+		<IosProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.iOS\nunit.runner.tests.iOS.csproj" />
 	</ItemGroup>
 
 	<!-- End Region -->
diff --git a/nuget/MainActivity.cs.txt.pp b/nuget/MainActivity.cs.txt.pp
index a04347c..0b5e62f 100644
--- a/nuget/MainActivity.cs.txt.pp
+++ b/nuget/MainActivity.cs.txt.pp
@@ -27,7 +27,7 @@ using Android.OS;
 
 namespace $rootnamespace$
 {
-    [Activity(Label = "NUnit 3.0", MainLauncher = true, Theme= "@android:style/Theme.Holo.Light, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation")]
+    [Activity(Label = "NUnit 3.0", MainLauncher = true, Theme= "@android:style/Theme.Holo.Light", ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsApplicationActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
diff --git a/nuget/nunit.runners.xamarin.nuspec b/nuget/nunit.runners.xamarin.nuspec
index fa3da44..5da2aa2 100644
--- a/nuget/nunit.runners.xamarin.nuspec
+++ b/nuget/nunit.runners.xamarin.nuspec
@@ -17,10 +17,14 @@
         <copyright>Copyright (c) 2015 Charlie Poole</copyright>
 
         <dependencies>
-            <dependency id="nunit.framework" version="3.0.0-beta-4" />
-            <dependency id="Xamarin.Forms" version="1.4.4.6392" />
+            <group targetFramework="Xamarin.iOS">
+                <dependency id="nunit" version="[$version$]" />
+                <dependency id="Xamarin.Forms" version="1.4.4.6392" />
+            </group>
             
             <group targetFramework="monoandroid">
+                <dependency id="nunit" version="[$version$]" />
+                <dependency id="Xamarin.Forms" version="1.4.4.6392" />
                 <dependency id="Xamarin.Android.Support.v4" version="22.2.1.0" />
             </group>
         </dependencies>
@@ -30,8 +34,8 @@
         <file src="bin\Release\nunit.runner.Droid.dll" target="lib\MonoAndroid\nunit.runner.Droid.dll" />
         <file src="bin\Release\nunit.runner.Droid.xml" target="lib\MonoAndroid\nunit.runner.Droid.xml" />
 
-        <file src="nuget\AppDelegate-unified.cs.txt.pp" target="content\Xamarin.iOS\AppDelegate.cs.txt.pp" />
-        <file src="bin\iPhone\Release\nunit.runner.iOS.dll" target="lib\Xamarin.iOS\nunit.runner.iOS.dll" />
-        <file src="bin\iPhone\Release\nunit.runner.iOS.xml" target="lib\Xamarin.iOS\nunit.runner.iOS.xml" />
+        <file src="nuget\AppDelegate.cs.txt.pp" target="content\Xamarin.iOS\AppDelegate.cs.txt.pp" />
+        <file src="bin\Release\nunit.runner.iOS.dll" target="lib\Xamarin.iOS\nunit.runner.iOS.dll" />
+        <file src="bin\Release\nunit.runner.iOS.xml" target="lib\Xamarin.iOS\nunit.runner.iOS.xml" />
     </files>
 </package>
diff --git a/nunit.runner.sln b/nunit.runner.sln
index dce3446..5398eaf 100644
--- a/nunit.runner.sln
+++ b/nunit.runner.sln
@@ -37,6 +37,7 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\tests\nunit.runner.tests\nunit.runner.tests.projitems*{391ce92c-08f6-4ddf-941c-a8980dcc196e}*SharedItemsImports = 4
+		src\tests\nunit.runner.tests\nunit.runner.tests.projitems*{17a2b97c-56ea-40b8-8901-5e0728876657}*SharedItemsImports = 4
 		src\tests\nunit.runner.tests\nunit.runner.tests.projitems*{af293652-baa0-4813-b4f3-2d5a2cdde0b4}*SharedItemsImports = 13
 		src\runner\nunit.runner\nunit.runner.projitems*{3bf3745a-8491-46a9-af66-f8de22accf31}*SharedItemsImports = 4
 		src\runner\nunit.runner\nunit.runner.projitems*{c9209134-aea3-4c7f-ad74-00d578a6f208}*SharedItemsImports = 13
diff --git a/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj b/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
index 0145094..fe3e205 100644
--- a/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
+++ b/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
@@ -39,6 +39,7 @@
     <DefineConstants>TRACE;__DROID__</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\Release\nunit.runner.Droid.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FormsViewGroup, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj b/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj
index a933083..6919814 100644
--- a/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj
+++ b/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj
@@ -18,23 +18,24 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchDebug>true</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <DocumentationFile>..\..\..\bin\AnyCPU\Debug\nunit.runner.iOS.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\bin\Debug\nunit.runner.iOS.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
+    <DocumentationFile>..\..\..\bin\Release\nunit.runner.iOS.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />