diff options
8 files changed, 26 insertions, 31 deletions
diff --git a/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj b/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj index 5c1b991b..a549f353 100644 --- a/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj +++ b/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj @@ -42,8 +42,9 @@ <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> - <Reference Include="Xamarin.UITest"> - <HintPath>..\packages\Xamarin.UITest.0.4.1\lib\Xamarin.UITest.dll</HintPath> + <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> @@ -76,10 +77,4 @@ <Target Name="AfterBuild"> </Target> --> - <ItemGroup> - <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> - <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project> - <Name>Xamarin.Forms.Core</Name> - </ProjectReference> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Android.UITests/packages.config b/Xamarin.Forms.Android.UITests/packages.config index cd848561..6a27733a 100644 --- a/Xamarin.Forms.Android.UITests/packages.config +++ b/Xamarin.Forms.Android.UITests/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="NUnit" version="2.6.3" targetFramework="net45" /> - <package id="Xamarin.UITest" version="0.4.1" targetFramework="net45" /> + <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" /> </packages>
\ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs index d5787865..44d86644 100644 --- a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs +++ b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs @@ -6,6 +6,7 @@ using Xamarin.Forms.ControlGallery.iOS; using System.Collections.Generic; using System.Linq; using System.Drawing; +using System.Collections; #if __UNIFIED__ using UIKit; @@ -324,12 +325,12 @@ namespace Xamarin.Forms.ControlGallery.iOS public IEnumerable<DataSource> Items { //get{ } - set { _tableItems = value.ToList(); } + set { _tableItems = new List<DataSource>(value); } } public NativeiOSListViewSource(NativeListView2 view) { - _tableItems = view.Items.ToList(); + _tableItems = new List<DataSource>(view.Items); _listView = view; } @@ -407,12 +408,13 @@ namespace Xamarin.Forms.ControlGallery.iOS public IEnumerable<string> Items { - set { _tableItems = value.ToList(); } + set { _tableItems = new List<string>(value); + } } public NativeListViewSource(NativeListView view) { - _tableItems = view.Items.ToList(); + _tableItems = new List<string>(view.Items); _listView = view; } @@ -524,7 +526,10 @@ namespace Xamarin.Forms.ControlGallery.iOS public CollectionViewController(UICollectionViewLayout layout, OnItemSelected onItemSelected) : base(layout) { - items = Enumerable.Range(0, 20).Select(c => $"#{c}").ToList(); + items = new List<string>(); + for (int i = 0; i < 20; i++) { + items.Add($"#{i}"); + } _onItemSelected = onItemSelected; } diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj index 0b0f5b12..50b3632b 100644 --- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj +++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj @@ -244,7 +244,7 @@ </Reference> <Reference Include="Xamarin.iOS" /> <Reference Include="Calabash"> - <HintPath>..\packages\Xamarin.TestCloud.Agent.0.19.0\lib\Xamarin.iOS10\Calabash.dll</HintPath> + <HintPath>..\packages\Xamarin.TestCloud.Agent.0.19.1\lib\Xamarin.iOS10\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 e3a4dde1..c372c5ec 100644 --- a/Xamarin.Forms.ControlGallery.iOS/packages.config +++ b/Xamarin.Forms.ControlGallery.iOS/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Xamarin.Insights" version="1.11.4" targetFramework="xamarinios10" /> - <package id="Xamarin.TestCloud.Agent" version="0.19.0" targetFramework="xamarinios10" /> -</packages>
\ No newline at end of file + <package id="Xamarin.TestCloud.Agent" version="0.19.1" targetFramework="xamarinios10" /> +</packages> diff --git a/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs b/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs index 410f50ef..014b6a50 100644 --- a/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs +++ b/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs @@ -91,15 +91,15 @@ namespace Xamarin.Forms.UITests public static void SwipeBackNavigation (this iOSApp app) { - app.PanCoordinates (0, 125, 75, 125, TimeSpan.FromSeconds (5)); + //app.PanCoordinates (0, 125, 75, 125, TimeSpan.FromSeconds (5)); } public static void DragFromTo (this iOSApp app, float xStart, float yStart, float xEnd, float yEnd, Speed speed = Speed.Fast) { - if (speed == Speed.Slow) - app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (3000)); - else - app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (1000)); + //if (speed == Speed.Slow) + // app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (3000)); + //else + // app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (1000)); } diff --git a/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj b/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj index cfc6d8e8..930b63c2 100644 --- a/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj +++ b/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj @@ -42,8 +42,9 @@ <Reference Include="nunit.framework"> <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath> </Reference> - <Reference Include="Xamarin.UITest"> - <HintPath>..\packages\Xamarin.UITest.0.4.1\lib\Xamarin.UITest.dll</HintPath> + <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath> + <Private>True</Private> </Reference> </ItemGroup> <ItemGroup> @@ -72,11 +73,5 @@ <Target Name="AfterBuild"> </Target> --> - <ItemGroup> - <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> - <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project> - <Name>Xamarin.Forms.Core</Name> - </ProjectReference> - </ItemGroup> <ItemGroup /> </Project>
\ No newline at end of file diff --git a/Xamarin.Forms.iOS.UITests/packages.config b/Xamarin.Forms.iOS.UITests/packages.config index cd848561..6a27733a 100644 --- a/Xamarin.Forms.iOS.UITests/packages.config +++ b/Xamarin.Forms.iOS.UITests/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="NUnit" version="2.6.3" targetFramework="net45" /> - <package id="Xamarin.UITest" version="0.4.1" targetFramework="net45" /> + <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" /> </packages>
\ No newline at end of file |