summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2017-09-14 22:26:02 +0100
committerRui Marinho <me@ruimarinho.net>2017-09-15 15:27:50 +0100
commitb80ec58710c7587703095e6bdd8bbe23ceda4f3d (patch)
tree91810d66f51df9c519caf279bdaf56bec3b3f75e
parentd99e76c7979b16cea16159ee449c8573fa48a0ac (diff)
downloadxamarin-forms-b80ec58710c7587703095e6bdd8bbe23ceda4f3d.tar.gz
xamarin-forms-b80ec58710c7587703095e6bdd8bbe23ceda4f3d.tar.bz2
xamarin-forms-b80ec58710c7587703095e6bdd8bbe23ceda4f3d.zip
[UITests] Update packages, fix failing test (#1140)
* [Nuget] Update UITest packages * [UITest] Fix failing tests by scrolling to results first * [PagesGallery] Remove iOS7 storyboard * Revert "[UITest] Fix failing tests by scrolling to results first" This reverts commit 54eba70cf04d155998c1436e1320e02984864bca. * [Controls] Move results labels on 51773 to the top
-rw-r--r--PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj9
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj2
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/packages.config2
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs4
-rw-r--r--Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj5
-rw-r--r--Xamarin.Forms.Core.Android.UITests/packages.config2
-rw-r--r--Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj5
-rw-r--r--Xamarin.Forms.Core.Windows.UITests/packages.config2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj5
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/packages.config2
-rw-r--r--Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj31
-rw-r--r--Xamarin.Forms.Core.macOS.UITests/packages.config8
12 files changed, 36 insertions, 41 deletions
diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
index cecb6247..d2a1a8a2 100644
--- a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
+++ b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
@@ -98,10 +98,6 @@
<ITunesArtwork Include="iTunesArtwork@2x" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Stubs\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS %28Forwarders%29.csproj">
- <Project>{39b3457f-01d8-43d0-8e84-d8c4f73cf48d}</Project>
- <Name>Xamarin.Forms.Platform.iOS %28Forwarders%29</Name>
- </ProjectReference>
<ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
@@ -128,6 +124,10 @@
<Name>PagesGallery</Name>
<Project>{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}</Project>
</ProjectReference>
+ <ProjectReference Include="..\..\Stubs\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS %28Forwarders%29.csproj">
+ <Project>{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}</Project>
+ <Name>Xamarin.Forms.Platform.iOS (Forwarders)</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default-568h%402x.png" />
@@ -145,7 +145,6 @@
<BundleResource Include="Resources\Icon-Small.png" />
<BundleResource Include="Resources\Icon-Small%402x.png" />
<BundleResource Include="Resources\Icon-Small%403x.png" />
- <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index 33881ea6..7aa601da 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -311,7 +311,7 @@
<HintPath>..\packages\Xamarin.Insights.1.12.3\lib\Xamarin.iOS10\Xamarin.Insights.dll</HintPath>
</Reference>
<Reference Include="Calabash">
- <HintPath>..\packages\Xamarin.TestCloud.Agent.0.20.3\lib\Xamarin.iOS10\Calabash.dll</HintPath>
+ <HintPath>..\packages\Xamarin.TestCloud.Agent.0.21.1\lib\Xamarin.iOS\Calabash.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/Xamarin.Forms.ControlGallery.iOS/packages.config b/Xamarin.Forms.ControlGallery.iOS/packages.config
index d660d029..7b00e47e 100644
--- a/Xamarin.Forms.ControlGallery.iOS/packages.config
+++ b/Xamarin.Forms.ControlGallery.iOS/packages.config
@@ -2,5 +2,5 @@
<packages>
<package id="AdvancedColorPicker" version="2.0.1" targetFramework="xamarinios10" />
<package id="Xamarin.Insights" version="1.12.3" targetFramework="xamarinios10" />
- <package id="Xamarin.TestCloud.Agent" version="0.20.3" targetFramework="xamarinios10" />
+ <package id="Xamarin.TestCloud.Agent" version="0.21.1" targetFramework="xamarinios10" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs
index 46841122..1e4c5e5b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs
@@ -156,6 +156,8 @@ namespace Xamarin.Forms.Controls.Issues
Margin = new Thickness(5, 20, 5, 0),
Children =
{
+ _results,
+ loadingState,
_image,
instructions,
legit,
@@ -164,8 +166,6 @@ namespace Xamarin.Forms.Controls.Issues
fakeUri,
crashImage,
uriInvalidImageData,
- _results,
- loadingState,
errorMessage
}
};
diff --git a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
index 6b9ce056..54863037 100644
--- a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
+++ b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
@@ -57,9 +57,8 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="Xamarin.UITest">
+ <HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/Xamarin.Forms.Core.Android.UITests/packages.config b/Xamarin.Forms.Core.Android.UITests/packages.config
index 22c7c9c7..573fa894 100644
--- a/Xamarin.Forms.Core.Android.UITests/packages.config
+++ b/Xamarin.Forms.Core.Android.UITests/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
- <package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
index 706be0f2..043831ec 100644
--- a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
+++ b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
@@ -46,9 +46,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="Xamarin.UITest">
+ <HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/Xamarin.Forms.Core.Windows.UITests/packages.config b/Xamarin.Forms.Core.Windows.UITests/packages.config
index 22c7c9c7..573fa894 100644
--- a/Xamarin.Forms.Core.Windows.UITests/packages.config
+++ b/Xamarin.Forms.Core.Windows.UITests/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
- <package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
index 0395ea1d..91cc072b 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
+++ b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
@@ -58,9 +58,8 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
- <Private>True</Private>
+ <Reference Include="Xamarin.UITest">
+ <HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/Xamarin.Forms.Core.iOS.UITests/packages.config b/Xamarin.Forms.Core.iOS.UITests/packages.config
index 22c7c9c7..573fa894 100644
--- a/Xamarin.Forms.Core.iOS.UITests/packages.config
+++ b/Xamarin.Forms.Core.iOS.UITests/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
- <package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
index 5ed23871..40c8f083 100644
--- a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
+++ b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
@@ -29,22 +29,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="ServiceStack.Interfaces">
- <HintPath>..\packages\ServiceStack.Interfaces.4.5.4\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="ServiceStack.Text">
- <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
- </Reference>
- <Reference Include="ServiceStack.Client">
- <HintPath>..\packages\ServiceStack.Client.4.5.4\lib\net45\ServiceStack.Client.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="Xamarin.UITest.Desktop">
<HintPath>..\packages\Xamarin.UITest.Desktop.0.0.7\lib\net45\Xamarin.UITest.Desktop.dll</HintPath>
</Reference>
@@ -67,6 +51,21 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Text">
+ <HintPath>..\packages\ServiceStack.Text.4.5.12\lib\net45\ServiceStack.Text.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Interfaces">
+ <HintPath>..\packages\ServiceStack.Interfaces.4.5.12\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Client">
+ <HintPath>..\packages\ServiceStack.Client.4.5.12\lib\net45\ServiceStack.Client.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.UITest">
+ <HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Xamarin.Forms.Core.macOS.UITests/packages.config b/Xamarin.Forms.Core.macOS.UITests/packages.config
index a9e82518..d87d9aab 100644
--- a/Xamarin.Forms.Core.macOS.UITests/packages.config
+++ b/Xamarin.Forms.Core.macOS.UITests/packages.config
@@ -2,9 +2,9 @@
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
- <package id="ServiceStack.Client" version="4.5.4" targetFramework="net45" />
- <package id="ServiceStack.Interfaces" version="4.5.4" targetFramework="net45" />
- <package id="ServiceStack.Text" version="4.5.4" targetFramework="net45" />
- <package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
+ <package id="ServiceStack.Client" version="4.5.12" targetFramework="net45" />
+ <package id="ServiceStack.Interfaces" version="4.5.12" targetFramework="net45" />
+ <package id="ServiceStack.Text" version="4.5.12" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
<package id="Xamarin.UITest.Desktop" version="0.0.7" targetFramework="net45" />
</packages> \ No newline at end of file