Merge pull request #30 from nunit/issue-28

Support Windows 10 UAP with Xamarin

Author: rprouse

MainPage.xaml.cs.txt.pp

@@ -0,0 +1,47 @@
+// Copyright (c) 2015 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+
+using System.Reflection;
+
+namespace $rootnamespace$
+{
+    public sealed partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+
+            // Windows Universal will not load all tests within the current project,
+            // you must do it explicitly below
+            var nunit = new NUnit.Runner.App();
+
+            // If you want to add tests in another assembly, add a reference and
+            // duplicate the following line with a type from the referenced assembly
+            nunit.AddTestAssembly(typeof(MainPage).GetTypeInfo().Assembly);
+
+            // Do you want to automatically run tests when the app starts?
+            nunit.AutoRun = true;
+
+            LoadApplication(nunit);
+        }
+    }
+}

NUnit.proj

@@ -18,7 +18,7 @@ var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
 
 // Versioning
 var packageVersion = "3.0.0";
-var packageModifier = "-rc-2";
+var packageModifier = "";
 var displayVersion = "3.0.0";
 
 var semVersion = packageVersion + packageModifier;
@@ -30,8 +30,6 @@ var androidDirectory = basePath + Directory("src/runner/nunit.runner.Droid/bin")
 var iosDirectory = basePath + Directory("src/runner/nunit.runner.iOS/bin/AnyCPU") + Directory(configuration);
 var wp81Directory = basePath + Directory("src/runner/nunit.runner.wp81/bin") + Directory(configuration);
 
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
 ///////////////////////////////////////////////////////////////////////////////

build.cake

@@ -3,12 +3,18 @@
     <metadata minClientVersion="2.8.5">
         <id>nunit.runner.xamarin</id>
         <version>$version$</version>
-        <title>NUnit 3.0 Xamarin Android, iOS and WinPhone 8.1 Runner</title>
+        <title>NUnit 3.0 Xamarin Runner</title>
         <authors>Rob Prouse</authors>
         <owners>Charlie Poole</owners>
-        <description>Adds support for running NUnit 3.0 unit tests on Android, iOS and Windows Phone 8.1</description>
-        <summary>NUnit 3.0 runner components for Android, iOS and Windows Phone 8.1 on Xamarin</summary>
-        <tags>nunit xamarin android ios monoandroid monotouch tdd unit test testing</tags>
+        <description>Adds support for running NUnit 3.0 unit tests on Xamarin
+   
+Supported Xamarin platforms:
+  - Android
+  - iOS
+  - Windows Phone 8.1
+  - Windows 10 Universal</description>
+        <summary>NUnit 3.0 runner components for Xamarin</summary>
+        <tags>nunit xamarin android ios monoandroid monotouch winphone uwp tdd unit test testing</tags>
         <language>en-US</language>
         <licenseUrl>http://nunit.org/nuget/nunit3-license.txt</licenseUrl>
         <projectUrl>https://github.com/nunit/nunit.xamarin</projectUrl>
@@ -18,22 +24,26 @@
 
         <dependencies>
             <group>
-                <dependency id="nunit" version="[$version$]" />
+                <dependency id="nunit" version="[3.0.0]" />
                 <dependency id="Xamarin.Forms" version="1.5.1.6471" />
             </group>
         </dependencies>
     </metadata>
     <files>
-        <file src="nuget\MainActivity.cs.txt.pp" target="content\MonoAndroid10\MainActivity.cs.txt.pp" />
+        <file src="nuget\MonoAndroid10\MainActivity.cs.txt.pp" target="content\MonoAndroid10\MainActivity.cs.txt.pp" />
         <file src="src\runner\nunit.runner.Droid\bin\Release\nunit.runner.Droid.dll" target="lib\MonoAndroid10\nunit.runner.Droid.dll" />
         <file src="src\runner\nunit.runner.Droid\bin\Release\nunit.runner.Droid.xml" target="lib\MonoAndroid10\nunit.runner.Droid.xml" />
 
-        <file src="nuget\AppDelegate.cs.txt.pp" target="content\Xamarin.iOS10\AppDelegate.cs.txt.pp" />
+        <file src="nuget\Xamarin.iOS10\AppDelegate.cs.txt.pp" target="content\Xamarin.iOS10\AppDelegate.cs.txt.pp" />
         <file src="src\runner\nunit.runner.iOS\bin\Release\nunit.runner.iOS.dll" target="lib\Xamarin.iOS10\nunit.runner.iOS.dll" />
         <file src="src\runner\nunit.runner.iOS\bin\Release\nunit.runner.iOS.xml" target="lib\Xamarin.iOS10\nunit.runner.iOS.xml" />
 
-        <file src="nuget\MainPage.xaml.cs.txt.pp" target="content\wpa81\MainPage.xaml.cs.txt.pp" />
+        <file src="nuget\wpa81\MainPage.xaml.cs.txt.pp" target="content\wpa81\MainPage.xaml.cs.txt.pp" />
         <file src="src\runner\nunit.runner.wp81\bin\Release\nunit.runner.wp81.dll" target="lib\wpa81\nunit.runner.wp81.dll" />
         <file src="src\runner\nunit.runner.wp81\bin\Release\nunit.runner.wp81.xml" target="lib\wpa81\nunit.runner.wp81.xml" />
+        
+        <file src="nuget\uap10.0\MainPage.xaml.cs.txt.pp" target="content\uap10.0\MainPage.xaml.cs.txt.pp" />
+        <file src="src\runner\nunit.runner.uwp\bin\Release\nunit.runner.uwp.dll" target="lib\uap10.0\nunit.runner.uwp.dll" />
+        <file src="src\runner\nunit.runner.uwp\bin\Release\nunit.runner.uwp.xml" target="lib\uap10.0\nunit.runner.uwp.xml" />
     </files>
 </package>