From fd48d18e392af87b82ca9cc943d025ace3972800 Mon Sep 17 00:00:00 2001 From: David Britch Date: Thu, 4 May 2017 14:40:16 +0100 Subject: [PATCH] Update iOS unit test runner to use stable xUnit packages, and fixed the project. --- .../AppDelegate.cs.txt | 51 ------------------- .../eShopOnContainers.TestRunner.iOS.csproj | 43 +++++----------- .../packages.config | 13 ++--- 3 files changed, 19 insertions(+), 88 deletions(-) delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs.txt mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs.txt b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs.txt deleted file mode 100644 index eda7e1886..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs.txt +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Foundation; -using UIKit; - -using Xunit.Runner; -using Xunit.Sdk; - - -namespace eShopOnContainers.TestRunner.iOS -{ - // 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 - // application events from iOS. - [Register("AppDelegate")] - public partial class AppDelegate : RunnerAppDelegate - { - - // - // This method is invoked when the application has loaded and is ready to run. In this - // method you should instantiate the window, load the UI into it and then make the window - // visible. - // - // You have 17 seconds to return from this method, or iOS will terminate your application. - // - public override bool FinishedLaunching(UIApplication app, NSDictionary options) - { - // We need this to ensure the execution assembly is part of the app bundle - AddExecutionAssembly(typeof(ExtensibilityPointFactory).Assembly); - - - // tests can be inside the main assembly - AddTestAssembly(Assembly.GetExecutingAssembly()); - // otherwise you need to ensure that the test assemblies will - // become part of the app bundle - //AddTestAssembly(typeof(PortableTests).Assembly); - -#if false - // you can use the default or set your own custom writer (e.g. save to web site and tweet it ;-) - Writer = new TcpTextWriter ("10.0.1.2", 16384); - // start running the test suites as soon as the application is loaded - AutoStart = true; - // crash the application (to ensure it's ended) and return to springboard - TerminateAfterExecution = true; -#endif - return base.FinishedLaunching(app, options); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj old mode 100755 new mode 100644 index d4705bc65..65d9ee05f --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj @@ -22,9 +22,9 @@ 4 false x86_64 - SdkOnly + None True - 10.1 + 10.2 False False False @@ -60,6 +60,8 @@ Entitlements.plist iPhone Developer true + 10.2 + None none @@ -123,39 +125,23 @@ ..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - - ..\..\..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll - True + + ..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll - - ..\..\..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll - True + + ..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - - ..\..\..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.core.dll - True + + ..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\xamarinios\xunit.execution.dotnet.dll - - ..\..\..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.execution.dotnet.dll - True + + ..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll - + ..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll - True - - - ..\..\..\..\packages\xunit.runner.utility.2.2.0-beta4-build3444\lib\netstandard1.1\xunit.runner.utility.dotnet.dll - True - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll - @@ -169,9 +155,8 @@ 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}. - - + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config old mode 100755 new mode 100644 index 812e8ee14..a5b51fc38 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config @@ -1,13 +1,10 @@  - - - - - - - + + + + - + \ No newline at end of file