Update iOS unit test runner to use stable xUnit packages, and fixed the project.
This commit is contained in:
		
							parent
							
								
									621db1d97b
								
							
						
					
					
						commit
						07ff213078
					
				| @ -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); | ||||
| 		} | ||||
|     } | ||||
| } | ||||
							
								
								
									
										43
									
								
								src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										43
									
								
								src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							| @ -22,9 +22,9 @@ | ||||
|     <WarningLevel>4</WarningLevel> | ||||
|     <ConsolePause>false</ConsolePause> | ||||
|     <MtouchArch>x86_64</MtouchArch> | ||||
|     <MtouchLink>SdkOnly</MtouchLink> | ||||
|     <MtouchLink>None</MtouchLink> | ||||
|     <MtouchDebug>True</MtouchDebug> | ||||
|     <MtouchSdkVersion>10.1</MtouchSdkVersion> | ||||
|     <MtouchSdkVersion>10.2</MtouchSdkVersion> | ||||
|     <MtouchProfiling>False</MtouchProfiling> | ||||
|     <MtouchFastDev>False</MtouchFastDev> | ||||
|     <MtouchUseLlvm>False</MtouchUseLlvm> | ||||
| @ -60,6 +60,8 @@ | ||||
|     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> | ||||
|     <CodesignKey>iPhone Developer</CodesignKey> | ||||
|     <MtouchDebug>true</MtouchDebug> | ||||
|     <MtouchSdkVersion>10.2</MtouchSdkVersion> | ||||
|     <MtouchLink>None</MtouchLink> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> | ||||
|     <DebugType>none</DebugType> | ||||
| @ -123,39 +125,23 @@ | ||||
|       <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath> | ||||
|     </Reference> | ||||
|     <Reference Include="Xamarin.iOS" /> | ||||
|     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath> | ||||
|       <Private>True</Private> | ||||
|     <Reference Include="xunit.abstractions"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath> | ||||
|     </Reference> | ||||
|     <Reference Include="xunit.assert, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll</HintPath> | ||||
|       <Private>True</Private> | ||||
|     <Reference Include="xunit.core"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath> | ||||
|     </Reference> | ||||
|     <Reference Include="xunit.core, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.core.dll</HintPath> | ||||
|       <Private>True</Private> | ||||
|     <Reference Include="xunit.execution.dotnet"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\xamarinios\xunit.execution.dotnet.dll</HintPath> | ||||
|     </Reference> | ||||
|     <Reference Include="xunit.execution.dotnet, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.execution.dotnet.dll</HintPath> | ||||
|       <Private>True</Private> | ||||
|     <Reference Include="xunit.runner.utility.dotnet"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll</HintPath> | ||||
|     </Reference> | ||||
|     <Reference Include="xunit.runner.devices, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||||
|     <Reference Include="xunit.runner.devices"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath> | ||||
|       <Private>True</Private> | ||||
|     </Reference> | ||||
|     <Reference Include="xunit.runner.utility.dotnet, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> | ||||
|       <HintPath>..\..\..\..\packages\xunit.runner.utility.2.2.0-beta4-build3444\lib\netstandard1.1\xunit.runner.utility.dotnet.dll</HintPath> | ||||
|       <Private>True</Private> | ||||
|     </Reference> | ||||
|     <Reference Include="Plugin.Settings.Abstractions"> | ||||
|       <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath> | ||||
|     </Reference> | ||||
|     <Reference Include="Plugin.Settings"> | ||||
|       <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath> | ||||
|     </Reference> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <Content Include="AppDelegate.cs.txt" /> | ||||
|     <Content Include="Entitlements.plist" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
| @ -169,9 +155,8 @@ | ||||
|     <PropertyGroup> | ||||
|       <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> | ||||
|     </PropertyGroup> | ||||
|     <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets'))" /> | ||||
|     <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> | ||||
|   </Target> | ||||
|   <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" /> | ||||
|   <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> | ||||
|   <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" /> | ||||
| </Project> | ||||
							
								
								
									
										13
									
								
								src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										13
									
								
								src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							| @ -1,13 +1,10 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <packages> | ||||
|   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" /> | ||||
|   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.abstractions" version="2.0.1" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.abstractions" version="2.0.0" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.core" version="2.1.0" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.extensibility.core" version="2.1.0" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.runner.devices" version="2.1.0" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.runner.utility" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" /> | ||||
|   <package id="xunit.runner.utility" version="2.1.0" targetFramework="xamarinios10" /> | ||||
| </packages> | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user