From e6b9e24ddd9d6f1ef05b12223a98329ebac0bc7f Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Wed, 14 Dec 2016 14:24:42 -0800 Subject: [PATCH] Update Nuget.Test Update to RealmJson v1.1.1 Update to latest Forms version --- src/Nuget.Test/Droid/Nuget.Test.Droid.csproj | 18 +++++------ src/Nuget.Test/Droid/packages.config | 4 +-- src/Nuget.Test/Nuget.Test/Nuget.Test.csproj | 22 +++++++------- src/Nuget.Test/Nuget.Test/packages.config | 4 +-- src/Nuget.Test/iOS/Nuget.Test.iOS.csproj | 30 +++++++++---------- src/Nuget.Test/iOS/packages.config | 4 +-- src/RealmJson.Test.iOS/UnitTestAppDelegate.cs | 4 ++- 7 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/Nuget.Test/Droid/Nuget.Test.Droid.csproj b/src/Nuget.Test/Droid/Nuget.Test.Droid.csproj index d2a8c5a..0d77696 100644 --- a/src/Nuget.Test/Droid/Nuget.Test.Droid.csproj +++ b/src/Nuget.Test/Droid/Nuget.Test.Droid.csproj @@ -105,25 +105,25 @@ ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + + - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\FormsViewGroup.dll + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\FormsViewGroup.dll - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - - ..\..\packages\RealmJson.Extensions.1.1.0\lib\RealmJson.Extensions.dll + ..\..\packages\RealmJson.Extensions.1.1.1\lib\RealmJson.Extensions.dll @@ -151,5 +151,5 @@ - + \ No newline at end of file diff --git a/src/Nuget.Test/Droid/packages.config b/src/Nuget.Test/Droid/packages.config index fd209b4..44d877a 100644 --- a/src/Nuget.Test/Droid/packages.config +++ b/src/Nuget.Test/Droid/packages.config @@ -9,7 +9,7 @@ - + @@ -65,5 +65,5 @@ - + \ No newline at end of file diff --git a/src/Nuget.Test/Nuget.Test/Nuget.Test.csproj b/src/Nuget.Test/Nuget.Test/Nuget.Test.csproj index 474125c..e793296 100644 --- a/src/Nuget.Test/Nuget.Test/Nuget.Test.csproj +++ b/src/Nuget.Test/Nuget.Test/Nuget.Test.csproj @@ -33,15 +33,6 @@ - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll - ..\..\packages\AutoMapper.5.1.1\lib\portable-net45+win8+wpa81\AutoMapper.dll @@ -57,8 +48,17 @@ ..\..\packages\Realm.0.80.0\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+Xamarin.iOS10+monotouch+Xamarin.Mac\Realm.dll + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll + - ..\..\packages\RealmJson.Extensions.1.1.0\lib\RealmJson.Extensions.dll + ..\..\packages\RealmJson.Extensions.1.1.1\lib\RealmJson.Extensions.dll @@ -72,7 +72,7 @@ - + \ No newline at end of file diff --git a/src/Nuget.Test/Nuget.Test/packages.config b/src/Nuget.Test/Nuget.Test/packages.config index ba4c6ad..76bceb1 100644 --- a/src/Nuget.Test/Nuget.Test/packages.config +++ b/src/Nuget.Test/Nuget.Test/packages.config @@ -5,7 +5,7 @@ - + @@ -18,5 +18,5 @@ - + \ No newline at end of file diff --git a/src/Nuget.Test/iOS/Nuget.Test.iOS.csproj b/src/Nuget.Test/iOS/Nuget.Test.iOS.csproj index 67929e7..8f1aa6c 100644 --- a/src/Nuget.Test/iOS/Nuget.Test.iOS.csproj +++ b/src/Nuget.Test/iOS/Nuget.Test.iOS.csproj @@ -105,18 +105,6 @@ - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - - ..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\..\packages\DotNetCross.Memory.Unsafe.0.2.2\lib\dotnet\DotNetCross.Memory.Unsafe.dll @@ -135,10 +123,22 @@ ..\..\packages\AutoMapper.5.1.1\lib\netstandard1.3\AutoMapper.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + + ..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + - ..\..\packages\RealmJson.Extensions.1.1.0\lib\RealmJson.Extensions.dll + ..\..\packages\RealmJson.Extensions.1.1.1\lib\RealmJson.Extensions.dll - @@ -151,7 +151,7 @@ - + \ No newline at end of file diff --git a/src/Nuget.Test/iOS/packages.config b/src/Nuget.Test/iOS/packages.config index c1a2533..868ead8 100644 --- a/src/Nuget.Test/iOS/packages.config +++ b/src/Nuget.Test/iOS/packages.config @@ -9,7 +9,7 @@ - + @@ -57,5 +57,5 @@ - + \ No newline at end of file diff --git a/src/RealmJson.Test.iOS/UnitTestAppDelegate.cs b/src/RealmJson.Test.iOS/UnitTestAppDelegate.cs index a245716..bd2dd2a 100644 --- a/src/RealmJson.Test.iOS/UnitTestAppDelegate.cs +++ b/src/RealmJson.Test.iOS/UnitTestAppDelegate.cs @@ -29,11 +29,13 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l // register every tests included in the main application/assembly runner.Add(System.Reflection.Assembly.GetExecutingAssembly()); + +#if UNITTEST // start running the test suites as soon as the application is loaded runner.AutoStart = true; // crash the application (to ensure it's ended) and return to springboard runner.TerminateAfterExecution = true; - +#endif window.RootViewController = new UINavigationController(runner.GetViewController()); // make the window visible