Skip to content
This repository was archived by the owner on Jan 8, 2023. It is now read-only.

Commit 2219d51

Browse files
ChrisMaddockChrisMaddock
authored
Merge pull request #85 from nunit/update-libraries
Update to NUnit 3.6.1
2 parents 378e0d6 + 7df9097 commit 2219d51

24 files changed

+108
-256
lines changed

‎nuget/nunit.runners.xamarin.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Supported Xamarin platforms:
2323

2424
<dependencies>
2525
<group>
26-
<dependency id="nunit" version="[3.5.0]" />
27-
<dependency id="Xamarin.Forms" version="2.3.3.168" />
26+
<dependency id="nunit" version="[3.6.1]" />
27+
<dependency id="Xamarin.Forms" version="1.5.0.6447" />
2828
<dependency id="PCLStorage" version="1.0.2" />
2929
</group>
3030
</dependencies>

‎nuget/uap10.0/MainPage.xaml.txt.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:forms="using:Xamarin.Forms.Platform.UWP"
7+
xmlns:forms="using:Xamarin.Forms.Platform.WinRT"
88
mc:Ignorable="d">
99

1010
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">

‎src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj

+3-74
Original file line numberDiff line numberDiff line change
@@ -39,99 +39,28 @@
3939
<DocumentationFile>bin\Release\nunit.runner.Droid.XML</DocumentationFile>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
4642
<Reference Include="Mono.Android" />
4743
<Reference Include="mscorlib" />
48-
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
49-
<HintPath>..\..\..\packages\NUnit.3.5.0\lib\dotnet\nunit.framework.dll</HintPath>
50-
<Private>True</Private>
51-
</Reference>
52-
<Reference Include="PCLStorage, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\PCLStorage.1.0.2\lib\monoandroid\PCLStorage.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
56-
<Reference Include="PCLStorage.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
57-
<HintPath>..\..\..\packages\PCLStorage.1.0.2\lib\monoandroid\PCLStorage.Abstractions.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
6044
<Reference Include="System" />
6145
<Reference Include="System.Core" />
46+
<Reference Include="System.IO.Compression" />
47+
<Reference Include="System.Net.Http" />
6248
<Reference Include="System.Xml.Linq" />
6349
<Reference Include="System.Xml" />
64-
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
74-
<Private>True</Private>
75-
</Reference>
76-
<Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
78-
<Private>True</Private>
79-
</Reference>
80-
<Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
81-
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
82-
<Private>True</Private>
83-
</Reference>
84-
<Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
86-
<Private>True</Private>
87-
</Reference>
88-
<Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
89-
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
90-
<Private>True</Private>
91-
</Reference>
92-
<Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
93-
<HintPath>..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
94-
<Private>True</Private>
95-
</Reference>
96-
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
97-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
98-
<Private>True</Private>
99-
</Reference>
100-
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
101-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
102-
<Private>True</Private>
103-
</Reference>
104-
<Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
105-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
106-
<Private>True</Private>
107-
</Reference>
108-
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
109-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
110-
<Private>True</Private>
111-
</Reference>
11250
</ItemGroup>
11351
<ItemGroup>
11452
<Compile Include="Resources\Resource.Designer.cs" />
11553
<Compile Include="Properties\AssemblyInfo.cs" />
11654
</ItemGroup>
11755
<ItemGroup>
118-
<None Include="packages.config" />
56+
<None Include="project.json" />
11957
<None Include="Resources\AboutResources.txt" />
12058
</ItemGroup>
12159
<ItemGroup>
12260
<AndroidResource Include="Resources\Values\strings.xml" />
12361
</ItemGroup>
12462
<Import Project="..\nunit.runner\nunit.runner.projitems" Label="Shared" Condition="Exists('..\nunit.runner\nunit.runner.projitems')" />
12563
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
126-
<Import Project="..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
127-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
128-
<PropertyGroup>
129-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
130-
</PropertyGroup>
131-
<Error Condition="!Exists('..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
132-
<Error Condition="!Exists('..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
133-
</Target>
134-
<Import Project="..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
13564
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
13665
Other similar extension points exist, see Microsoft.Common.targets.
13766
<Target Name="BeforeBuild">

‎src/runner/nunit.runner.Droid/nunit.runner.Droid.nuget.targets

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
4+
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
5+
</PropertyGroup>
6+
<ImportGroup>
7+
<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')" />
8+
</ImportGroup>
9+
</Project>

‎src/runner/nunit.runner.Droid/packages.config

-14
This file was deleted.

‎src/runner/nunit.runner.Droid/project.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"dependencies": {
3+
"NUnit": "3.6.1",
4+
"PCLStorage": "1.0.2",
5+
"Xamarin.Forms": "1.5.0.6447"
6+
},
7+
"frameworks": {
8+
"monoandroid60": {}
9+
},
10+
"runtimes": {
11+
"win": {}
12+
}
13+
}

‎src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj

+3-36
Original file line numberDiff line numberDiff line change
@@ -39,50 +39,17 @@
3939
<Compile Include="Properties\AssemblyInfo.cs" />
4040
</ItemGroup>
4141
<ItemGroup>
42-
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\packages\NUnit.3.5.0\lib\dotnet\nunit.framework.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="PCLStorage, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\packages\PCLStorage.1.0.2\lib\portable-Xamarin.iOS+Xamarin.Mac\PCLStorage.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
50-
<Reference Include="PCLStorage.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
51-
<HintPath>..\..\..\packages\PCLStorage.1.0.2\lib\portable-Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
5442
<Reference Include="System" />
43+
<Reference Include="System.IO.Compression" />
44+
<Reference Include="System.Net.Http" />
5545
<Reference Include="System.Xml" />
5646
<Reference Include="System.Core" />
5747
<Reference Include="System.Xml.Linq" />
58-
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
68-
<Private>True</Private>
69-
</Reference>
70-
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.168\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
7448
<Reference Include="Xamarin.iOS" />
7549
</ItemGroup>
7650
<ItemGroup>
77-
<None Include="packages.config" />
51+
<BundleResource Include="project.json" />
7852
</ItemGroup>
7953
<Import Project="..\nunit.runner\nunit.runner.projitems" Label="Shared" Condition="Exists('..\nunit.runner\nunit.runner.projitems')" />
8054
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
81-
<Import Project="..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
82-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
83-
<PropertyGroup>
84-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
85-
</PropertyGroup>
86-
<Error Condition="!Exists('..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
87-
</Target>
8855
</Project>

‎src/runner/nunit.runner.iOS/nunit.runner.iOS.nuget.targets

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
4+
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
5+
</PropertyGroup>
6+
<ImportGroup>
7+
<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')" />
8+
</ImportGroup>
9+
</Project>

‎src/runner/nunit.runner.iOS/packages.config

-6
This file was deleted.

‎src/runner/nunit.runner.iOS/project.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"dependencies": {
3+
"NUnit": "3.6.1",
4+
"PCLStorage": "1.0.2",
5+
"Xamarin.Forms": "1.5.0.6447"
6+
},
7+
"frameworks": {
8+
"xamarinios10": {}
9+
},
10+
"runtimes": {
11+
"win": {}
12+
}
13+
}

‎src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
55
</PropertyGroup>
66
<ImportGroup>
7-
<Import Project="$(NuGetPackageRoot)xamarin.forms\2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
7+
<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')" />
88
</ImportGroup>
99
</Project>

‎src/runner/nunit.runner.uwp/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"dependencies": {
33
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
4-
"NUnit": "3.5.0",
4+
"NUnit": "3.6.1",
55
"PCLStorage": "1.0.2",
6-
"Xamarin.Forms": "2.3.3.168"
6+
"Xamarin.Forms": "1.5.0.6447"
77
},
88
"frameworks": {
99
"uap10.0": {}

‎src/runner/nunit.runner/Properties/AssemblyCommon.cs

-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
[assembly: AssemblyConfiguration("iOS Debug")]
4242
#elif __DROID__
4343
[assembly: AssemblyConfiguration("Android Debug")]
44-
#elif WINDOWS_PHONE_APP
45-
[assembly: AssemblyConfiguration("Windows Phone 8.1 Debug")]
4644
#elif WINDOWS_UWP
4745
[assembly: AssemblyConfiguration("Universal Windows Debug")]
4846
#else
@@ -53,8 +51,6 @@
5351
[assembly: AssemblyConfiguration("iOS")]
5452
#elif __DROID__
5553
[assembly: AssemblyConfiguration("Android")]
56-
#elif WINDOWS_PHONE_APP
57-
[assembly: AssemblyConfiguration("Windows Phone 8.1")]
5854
#elif WINDOWS_UWP
5955
[assembly: AssemblyConfiguration("Universal Windows")]
6056
#else

0 commit comments

Comments
 (0)