DeGsoft
/
maui-linux
зеркало из https://github.com/DeGsoft/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Controls] Fix use of internal extension methods (#237) 

* [Controls] Fix use of internal extension methods

* [Controls] Update Xamarin UItest on controls

* Update package TestCloud

* Fix

* Revert "Fix"

This reverts commit 283f96a2210322bf37795dff61394938eb909f59.

* Fix reference
This commit is contained in:
Rui Marinho 2016-06-22 15:59:54 +01:00 коммит произвёл GitHub
Родитель 22f3c5b364
Коммит e5dd925ee5
8 изменённых файлов: 26 добавлений и 31 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj
Просмотреть файл

@ -42,8 +42,9 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Xamarin.UITest"> <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.UITest.0.4.1\lib\Xamarin.UITest.dll</HintPath> <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -76,10 +77,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </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> </Project>

2
Xamarin.Forms.Android.UITests/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="NUnit" version="2.6.3" targetFramework="net45" /> <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> </packages>

15
Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
Просмотреть файл

@ -6,6 +6,7 @@ using Xamarin.Forms.ControlGallery.iOS;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Drawing; using System.Drawing;
using System.Collections;
#if __UNIFIED__ #if __UNIFIED__
using UIKit; using UIKit;
@ -324,12 +325,12 @@ namespace Xamarin.Forms.ControlGallery.iOS
public IEnumerable<DataSource> Items public IEnumerable<DataSource> Items
{ {
//get{ } //get{ }
set { _tableItems = value.ToList(); } set { _tableItems = new List<DataSource>(value); }
} }
public NativeiOSListViewSource(NativeListView2 view) public NativeiOSListViewSource(NativeListView2 view)
{ {
_tableItems = view.Items.ToList(); _tableItems = new List<DataSource>(view.Items);
_listView = view; _listView = view;
} }
@ -407,12 +408,13 @@ namespace Xamarin.Forms.ControlGallery.iOS
public IEnumerable<string> Items public IEnumerable<string> Items
{ {
set { _tableItems = value.ToList(); } set { _tableItems = new List<string>(value);
}
} }
public NativeListViewSource(NativeListView view) public NativeListViewSource(NativeListView view)
{ {
_tableItems = view.Items.ToList(); _tableItems = new List<string>(view.Items);
_listView = view; _listView = view;
} }
@ -524,7 +526,10 @@ namespace Xamarin.Forms.ControlGallery.iOS
public CollectionViewController(UICollectionViewLayout layout, OnItemSelected onItemSelected) : base(layout) 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; _onItemSelected = onItemSelected;
} }

2
Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
Просмотреть файл

@ -244,7 +244,7 @@
</Reference> </Reference>
<Reference Include="Xamarin.iOS" /> <Reference Include="Xamarin.iOS" />
<Reference Include="Calabash"> <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> </Reference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

4
Xamarin.Forms.ControlGallery.iOS/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Xamarin.Insights" version="1.11.4" targetFramework="xamarinios10" /> <package id="Xamarin.Insights" version="1.11.4" targetFramework="xamarinios10" />
<package id="Xamarin.TestCloud.Agent" version="0.19.0" targetFramework="xamarinios10" /> <package id="Xamarin.TestCloud.Agent" version="0.19.1" targetFramework="xamarinios10" />
</packages> </packages>

10
Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs
Просмотреть файл

@ -91,15 +91,15 @@ namespace Xamarin.Forms.UITests
public static void SwipeBackNavigation (this iOSApp app) 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) public static void DragFromTo (this iOSApp app, float xStart, float yStart, float xEnd, float yEnd, Speed speed = Speed.Fast)
{ {
if (speed == Speed.Slow) //if (speed == Speed.Slow)
app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (3000)); // app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (3000));
else //else
app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (1000)); // app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (1000));
} }

11
Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj
Просмотреть файл

@ -42,8 +42,9 @@
<Reference Include="nunit.framework"> <Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath> <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.UITest"> <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.UITest.0.4.1\lib\Xamarin.UITest.dll</HintPath> <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -72,11 +73,5 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </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 /> <ItemGroup />
</Project> </Project>

2
Xamarin.Forms.iOS.UITests/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="NUnit" version="2.6.3" targetFramework="net45" /> <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> </packages>