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

[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
This commit is contained in:
Rui Marinho 2017-09-14 22:26:02 +01:00 коммит произвёл GitHub
Родитель c60367fe34
Коммит 0314360850
12 изменённых файлов: 18 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
Просмотреть файл

@ -99,10 +99,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>
@ -129,6 +125,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" />
@ -146,7 +146,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" />

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

@ -312,7 +312,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.7\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" />

2
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.7" targetFramework="xamarinios10" />
<package id="Xamarin.TestCloud.Agent" version="0.21.1" targetFramework="xamarinios10" />
</packages>

4
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
}
};

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

@ -58,7 +58,7 @@
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
<HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
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.10" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
</packages>

2
Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
Просмотреть файл

@ -47,7 +47,7 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
<HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
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.10" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
</packages>

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

@ -59,7 +59,7 @@
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
<HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
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.10" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
</packages>

6
Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
Просмотреть файл

@ -54,9 +54,6 @@
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Text">
<HintPath>..\packages\ServiceStack.Text.4.5.12\lib\net45\ServiceStack.Text.dll</HintPath>
</Reference>
@ -66,6 +63,9 @@
<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" />

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

@ -5,6 +5,6 @@
<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.0.10" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" />
<package id="Xamarin.UITest.Desktop" version="0.0.7" targetFramework="net45" />
</packages>