Fixed Droid unit test runner project.

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainActivity.cs.txt

@@ -1,43 +0,0 @@
-using System;
-using System.Reflection;
-using Android.App;
-using Android.Content;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using Android.OS;
-
-using Xunit.Sdk;
-using Xunit.Runners.UI;
-
-namespace eShopOnContainers.TestRunner.Droid
-{
-    [Activity(Label = "xUnit Android Runner", MainLauncher = true, Theme= "@android:style/Theme.Material.Light")]
-    public class MainActivity : RunnerActivity
-    {
-
-        protected override void OnCreate(Bundle bundle)
-        {
-            // tests can be inside the main assembly
-            AddTestAssembly(Assembly.GetExecutingAssembly());
-
-            AddExecutionAssembly(typeof(ExtensibilityPointFactory).Assembly);
-            // or in any reference assemblies			
-
-            //AddTestAssembly(typeof(PortableTests).Assembly);
-            // or in any assembly that you load (since JIT is available)
-
-#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
-            // you cannot add more assemblies once calling base
-            base.OnCreate(bundle);
-        }
-    }
-}
-

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

@@ -44,7 +44,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -100,29 +99,97 @@
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <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\monoandroid\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\MonoAndroid\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 Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="Autofac">
+      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
+    </Reference>
+    <Reference Include="Plugin.Settings.Abstractions">
+      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Plugin.Settings">
+      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.assert">
+      <HintPath>..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="SlideOverKit">
+      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
+    </Reference>
+    <Reference Include="SlideOverKit.Droid">
+      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll</HintPath>
+    </Reference>
+    <Reference Include="Acr.Support.Android">
+      <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="AndHUD">
+      <HintPath>..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll</HintPath>
+    </Reference>
+    <Reference Include="Splat">
+      <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll</HintPath>
+    </Reference>
+    <Reference Include="Acr.UserDialogs">
+      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath>
+    </Reference>
+    <Reference Include="Acr.UserDialogs.Interface">
+      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="IdentityModel.Portable">
+      <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
+    </Reference>
+    <Reference Include="FFImageLoading">
+      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
+    </Reference>
+    <Reference Include="FFImageLoading.Platform">
+      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="FFImageLoading.Forms">
+      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
+    </Reference>
+    <Reference Include="FFImageLoading.Forms.Droid">
+      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
+    </Reference>
+    <Reference Include="ModernHttpClient">
+      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
+    </Reference>
+    <Reference Include="OkHttp">
+      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Pages">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.0.38-pre2\lib\MonoAndroid10\Xamarin.Forms.Pages.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Theme.Android">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Theme.Base">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Theme.Light">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Light.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -150,9 +217,6 @@
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="MainActivity.cs.txt" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj">
       <Project>{f7b6a162-bc4d-4924-b16a-713f9b0344e7}</Project>
@@ -166,10 +230,8 @@
       <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\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'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\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\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\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')" />
   <!-- 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.
@@ -178,4 +240,6 @@
 		<Target Name="AfterBuild">
 		</Target>
  -->
+  <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
 </Project>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config

@@ -1,5 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Acr.Support" version="2.1.0" targetFramework="monoandroid60" />
+  <package id="Acr.UserDialogs" version="6.3.3" targetFramework="monoandroid60" />
+  <package id="AndHUD" version="1.2.0" targetFramework="monoandroid60" />
+  <package id="Autofac" version="4.5.0" targetFramework="monoandroid60" />
+  <package id="IdentityModel" version="1.3.1" targetFramework="monoandroid60" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="monoandroid60" />
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid60" />
+  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid60" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid60" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
+  <package id="SlideOverKit" version="2.1.4" targetFramework="monoandroid60" />
+  <package id="Splat" version="1.6.2" targetFramework="monoandroid60" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Collections" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="monoandroid60" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Console" version="4.0.0" targetFramework="monoandroid60" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.IO" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Linq" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Net.Sockets" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="monoandroid60" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="monoandroid60" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Threading" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" />
@@ -8,13 +67,17 @@
   <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
+  <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
+  <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
-  <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="monoandroid70" />
-  <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
-  <package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
-  <package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
-  <package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
-  <package id="xunit.runner.devices" version="2.1.0" targetFramework="monoandroid70" />
-  <package id="xunit.runner.utility" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms.Pages" version="2.3.0.38-pre2" targetFramework="monoandroid60" />
+  <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid60" />
+  <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="monoandroid60" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="monoandroid60" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="monoandroid60" />
+  <package id="xunit.core" version="2.1.0" targetFramework="monoandroid60" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="monoandroid60" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="monoandroid60" />
+  <package id="xunit.runner.devices" version="2.1.0" targetFramework="monoandroid60" />
+  <package id="xunit.runner.utility" version="2.1.0" targetFramework="monoandroid60" />
 </packages>