Skip to content

Commit

Permalink
Merge pull request #33 from nunit/update-libs
Browse files Browse the repository at this point in the history
Update to NUnit/nunit.xamarin 3.6.1
  • Loading branch information
rprouse authored Apr 3, 2017
2 parents ad19e59 + b295334 commit 21e57f0
Show file tree
Hide file tree
Showing 32 changed files with 113 additions and 63 deletions.
Binary file added nunit.templates/Packages/NUnit.3.6.1.nupkg
Binary file not shown.
Binary file removed nunit.templates/Packages/nunit.3.0.1.nupkg
Binary file not shown.
Binary file removed nunit.templates/Packages/nunit.xamarin.3.0.1.nupkg
Binary file not shown.
Binary file not shown.
Binary file added nunit.templates/Packages/pclstorage.1.0.2.nupkg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
30 changes: 13 additions & 17 deletions nunit.templates/nunit.templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,35 +92,31 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\nunit.3.0.1.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\nunit.xamarin.3.0.1.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\xamarin.android.support.v4.23.0.1.3.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\xamarin.forms.2.0.0.6490.nupkg">
<Content Include="license.rtf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\xamarin.android.support.design.23.0.1.3.nupkg">
<None Include="packages.config" />
<Content Include="Packages\NUnit.3.6.1.nupkg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\xamarin.android.support.v7.appcompat.23.0.1.3.nupkg">
<Content Include="Packages\pclstorage.1.0.2.nupkg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\xamarin.android.support.v7.cardview.23.0.1.3.nupkg">
<Content Include="Packages\nunit.xamarin.3.6.1.nupkg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\xamarin.android.support.v7.mediarouter.23.0.1.3.nupkg">
<Content Include="Packages\xamarin.forms.1.5.0.6447.nupkg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="license.rtf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Content Include="Packages\xamarin.android.support.v4.22.2.1.nupkg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="packages.config" />
<None Include="Properties\template-builder.props">
<SubType>Designer</SubType>
</None>
Expand Down
13 changes: 5 additions & 8 deletions nunit.templates/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@
<Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="Output\ItemTemplates" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="Output\ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="snippets.pkgdef" />
<Asset Type="nunit.3.0.1.nupkg" d:Source="File" Path="Packages\nunit.3.0.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="nunit.xamarin.3.0.1.nupkg" d:Source="File" Path="Packages\nunit.xamarin.3.0.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.android.support.v4.23.0.1.3.nupkg" d:Source="File" Path="Packages\xamarin.android.support.v4.23.0.1.3.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.forms.2.0.0.6490.nupkg" d:Source="File" Path="Packages\xamarin.forms.2.0.0.6490.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.android.support.design.23.0.1.3.nupkg" d:Source="File" Path="Packages\xamarin.android.support.design.23.0.1.3.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.android.support.v7.appcompat.23.0.1.3.nupkg" d:Source="File" Path="Packages\xamarin.android.support.v7.appcompat.23.0.1.3.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.android.support.v7.cardview.23.0.1.3.nupkg" d:Source="File" Path="Packages\xamarin.android.support.v7.cardview.23.0.1.3.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.android.support.v7.mediarouter.23.0.1.3.nupkg" d:Source="File" Path="Packages\xamarin.android.support.v7.mediarouter.23.0.1.3.nupkg" d:VsixSubPath="Packages" />
<Asset Type="nunit.3.6.1.nupkg" d:Source="File" Path="Packages\NUnit.3.6.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="pclstorage.1.0.2.nupkg" d:Source="File" Path="Packages\pclstorage.1.0.2.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.forms.1.5.0.6447.nupkg" d:Source="File" Path="Packages\xamarin.forms.1.5.0.6447.nupkg" d:VsixSubPath="Packages" />
<Asset Type="xamarin.android.support.v4.22.2.1.nupkg" d:Source="File" Path="Packages\xamarin.android.support.v4.22.2.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="nunit.xamarin.3.6.1.nupkg" d:Source="File" Path="Packages\nunit.xamarin.3.6.1.nupkg" d:VsixSubPath="Packages" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26208.0,16.0)" DisplayName="Visual Studio core editor" />
Expand Down
2 changes: 1 addition & 1 deletion nunit.tests.csharp/_Definitions/_project.vstemplate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
<package id="NUnit" version="3.0.1" />
<package id="NUnit" version="3.6.1" />
</packages>
</WizardData>
</VSTemplate>
1 change: 0 additions & 1 deletion nunit.tests.csharp/nunit.tests.csharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<Compile Include="TestClass.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion nunit.tests.vb/_Definitions/_project.vstemplate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
<package id="NUnit" version="3.0.1" />
<package id="NUnit" version="3.6.1" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 0 additions & 4 deletions nunit.tests.vb/nunit.tests.vb.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="_Definitions\_project.vstemplate.xml" />
<Content Include="_preprocess.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
28 changes: 24 additions & 4 deletions xamarin/nunit.tests.Droid/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ***********************************************************************
// Copyright (c) 2015 Charlie Poole
// Copyright (c) 2017 Charlie Poole
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
Expand All @@ -21,13 +21,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ***********************************************************************

using System.IO;
using Android.App;
using Android.Content.PM;
using Android.OS;
using NUnit.Runner.Services;

namespace NUnit.Tests
{
[Activity(Label = "NUnit", Icon = "@drawable/icon", Theme= "@android:style/Theme.Holo.Light", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Label = "NUnit", Icon = "@drawable/icon", Theme = "@android:style/Theme.Holo.Light", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsApplicationActivity
{
protected override void OnCreate(Bundle savedInstanceState)
Expand All @@ -42,8 +44,26 @@ protected override void OnCreate(Bundle savedInstanceState)
// If you want to add tests in another assembly
//nunit.AddTestAssembly(typeof(MyTests).Assembly);

// Do you want to automatically run tests when the app starts?
nunit.AutoRun = true;
// Available options for testing
nunit.Options = new TestOptions
{
// If True, the tests will run automatically when the app starts
// otherwise you must run them manually.
AutoRun = true,

// If True, the application will terminate automatically after running the tests.
//TerminateAfterExecution = true,

// Information about the tcp listener host and port.
// For now, send result as XML to the listening server.
//TcpWriterParameters = new TcpWriterInfo("192.168.0.108", 13000),

// Creates a NUnit Xml result file on the host file system using PCLStorage library.
// CreateXmlResultFile = true,

// Choose a different path for the xml result file
// ResultFilePath = Path.Combine(Environment.ExternalStorageDirectory.Path, Environment.DirectoryDownloads, "Nunit", "Results.xml")
};

LoadApplication(nunit);
}
Expand Down
3 changes: 2 additions & 1 deletion xamarin/nunit.tests.Droid/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
<uses-sdk android:minSdkVersion="15" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application></application>
</manifest>
2 changes: 1 addition & 1 deletion xamarin/nunit.tests.Droid/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyDescription("NUnit Test Runner for Android")]

[assembly: AssemblyCompany("NUnit Software")]
[assembly: AssemblyProduct("NUnit 3.0")]
[assembly: AssemblyProduct("NUnit 3")]
[assembly: AssemblyCopyright("Copyright (C) 2015 Charlie Poole")]
[assembly: AssemblyTrademark("NUnit is a trademark of NUnit Software")]
[assembly: AssemblyCulture("")]
Expand Down
13 changes: 5 additions & 8 deletions xamarin/nunit.tests.Droid/_Definitions/_project.vstemplate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,11 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
<package id="NUnit" version="3.0.1" />
<package id="nunit.xamarin" version="3.0.1" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.3" />
<package id="Xamarin.Android.Support.Design" version="23.0.1.3" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.0.1.3" />
<package id="Xamarin.Android.Support.v7.CardView" version="23.0.1.3" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="23.0.1.3" />
<package id="Xamarin.Forms" version="2.0.0.6490" />
<package id="NUnit" version="3.6.1" />
<package id="nunit.xamarin" version="3.6.1" />
<package id="Xamarin.Forms" version="1.5.0.6447" />
<package id="PCLStorage" version="1.0.2" />
<package id="Xamarin.Android.Support.v4" version="22.2.1" />
</packages>
</WizardData>
</VSTemplate>
1 change: 0 additions & 1 deletion xamarin/nunit.tests.Droid/nunit.tests.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand Down
31 changes: 27 additions & 4 deletions xamarin/nunit.tests.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ***********************************************************************
// Copyright (c) 2015 Charlie Poole
// Copyright (c) 2017 Charlie Poole
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
Expand All @@ -21,10 +21,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ***********************************************************************

using System;
using System.IO;
using Foundation;

using NUnit.Runner.Services;

using UIKit;

namespace NUnit.Tests
namespace NUnit.Runner.Tests
{
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
Expand All @@ -49,8 +54,26 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
// If you want to add tests in another assembly
//nunit.AddTestAssembly(typeof(MyTests).Assembly);

// Do you want to automatically run tests when the app starts?
nunit.AutoRun = true;
// Available options for testing
nunit.Options = new TestOptions
{
// If True, the tests will run automatically when the app starts
// otherwise you must run them manually.
AutoRun = true,

// If True, the application will terminate automatically after running the tests.
//TerminateAfterExecution = true,

// Information about the tcp listener host and port.
// For now, send result as XML to the listening server.
//TcpWriterParameters = new TcpWriterInfo("192.168.0.108", 13000),

// Creates a NUnit Xml result file on the host file system using PCLStorage library.
CreateXmlResultFile = true,

// Choose a different path for the xml result file (ios file share / library directory)
ResultFilePath = Path.Combine(NSFileManager.DefaultManager.GetUrls(NSSearchPathDirectory.LibraryDirectory, NSSearchPathDomain.User)[0].Path, "Results.xml")
};

LoadApplication(nunit);

Expand Down
2 changes: 1 addition & 1 deletion xamarin/nunit.tests.iOS/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyDescription("NUnit Test Runner for iOS")]

[assembly: AssemblyCompany("NUnit Software")]
[assembly: AssemblyProduct("NUnit 3.0")]
[assembly: AssemblyProduct("NUnit 3")]
[assembly: AssemblyCopyright("Copyright (C) 2015 Charlie Poole")]
[assembly: AssemblyTrademark("NUnit is a trademark of NUnit Software")]
[assembly: AssemblyCulture("")]
Expand Down
7 changes: 4 additions & 3 deletions xamarin/nunit.tests.iOS/_Definitions/_project.vstemplate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
<package id="NUnit" version="3.0.1" />
<package id="nunit.xamarin" version="3.0.1" />
<package id="Xamarin.Forms" version="2.0.0.6490" />
<package id="NUnit" version="3.6.1" />
<package id="nunit.xamarin" version="3.6.1" />
<package id="Xamarin.Forms" version="1.5.0.6447" />
<package id="PCLStorage" version="1.0.2" />
</packages>
</WizardData>
</VSTemplate>
2 changes: 1 addition & 1 deletion xamarin/nunit.tests.uwp/MainTestPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:local="using:NUnit.Tests"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:forms="using:Xamarin.Forms.Platform.UWP"
xmlns:forms="using:Xamarin.Forms.Platform.WinRT"
mc:Ignorable="d">

<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Expand Down
24 changes: 22 additions & 2 deletions xamarin/nunit.tests.uwp/MainTestPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
// ***********************************************************************

using System.Reflection;
using NUnit.Runner.Services;

namespace NUnit.Tests
{
Expand All @@ -38,8 +39,27 @@ public MainPage()
// 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;
// Available options for testing
nunit.Options = new TestOptions
{
// If True, the tests will run automatically when the app starts
// otherwise you must run them manually.
AutoRun = true,

// If True, the application will terminate automatically after running the tests.
//TerminateAfterExecution = true,

// Information about the tcp listener host and port.
// For now, send result as XML to the listening server.
// NOTE: Your UWP App must have Private Networks capability enabled
//TcpWriterParameters = new TcpWriterInfo("192.168.0.108", 13000),

// Creates a NUnit Xml result file on the host file system using PCLStorage library.
CreateXmlResultFile = false,

// Choose a different path for the xml result file
// ResultFilePath = System.IO.Path.Combine(Windows.Storage.ApplicationData.Current.TemporaryFolder.Path, "Nunit", "Results.xml")
};

LoadApplication(nunit);
}
Expand Down
2 changes: 1 addition & 1 deletion xamarin/nunit.tests.uwp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyDescription("NUnit Test Runner for Universal Windows")]

[assembly: AssemblyCompany("NUnit Software")]
[assembly: AssemblyProduct("NUnit 3.0")]
[assembly: AssemblyProduct("NUnit 3")]
[assembly: AssemblyCopyright("Copyright (C) 2015 Charlie Poole")]
[assembly: AssemblyTrademark("NUnit is a trademark of NUnit Software")]
[assembly: AssemblyCulture("")]
Expand Down
7 changes: 4 additions & 3 deletions xamarin/nunit.tests.uwp/_Definitions/_project.vstemplate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
<package id="NUnit" version="3.0.1" />
<package id="nunit.xamarin" version="3.0.1" />
<package id="Xamarin.Forms" version="2.0.0.6490" />
<package id="NUnit" version="3.6.1" />
<package id="nunit.xamarin" version="3.6.1" />
<package id="Xamarin.Forms" version="1.5.0.6447" />
<package id="PCLStorage" version="1.0.2" />
</packages>
<packages repository="registry" keyName="NETCoreSDK" isPreunzipped="true">
<package id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.0.0" skipAssemblyReferences="false" />
Expand Down
2 changes: 1 addition & 1 deletion xamarin/nunit.tests.uwp/nunit.tests.uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>NUnit.Tests</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
Expand Down

0 comments on commit 21e57f0

Please sign in to comment.